Merge remote-tracking branch 'joar/media-fixes'
authorJoar Wandborg <git@wandborg.com>
Mon, 9 Apr 2012 18:36:50 +0000 (20:36 +0200)
committerJoar Wandborg <git@wandborg.com>
Mon, 9 Apr 2012 18:36:50 +0000 (20:36 +0200)

Trivial merge