Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 10 Apr 2011 20:04:21 +0000 (15:04 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 10 Apr 2011 20:04:21 +0000 (15:04 -0500)

Trivial merge