Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 6 May 2011 11:55:20 +0000 (06:55 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 6 May 2011 11:55:20 +0000 (06:55 -0500)

Trivial merge