Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 20 Apr 2011 00:05:58 +0000 (19:05 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 20 Apr 2011 00:05:58 +0000 (19:05 -0500)

Trivial merge