Merge remote branch 'remotes/elrond/idea/use_media_url_for_self'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 10 Sep 2011 22:42:50 +0000 (17:42 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 10 Sep 2011 22:42:50 +0000 (17:42 -0500)

Trivial merge