Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Wed, 4 May 2011 20:31:08 +0000 (22:31 +0200)
committerJoar Wandborg <git@wandborg.com>
Wed, 4 May 2011 20:31:08 +0000 (22:31 +0200)

Trivial merge