Merge remote branch 'origin/terencehill/megaerebus_image_fix'
authorSamual <samual@xonotic.org>
Mon, 12 Sep 2011 06:30:27 +0000 (02:30 -0400)
committerSamual <samual@xonotic.org>
Mon, 12 Sep 2011 06:30:27 +0000 (02:30 -0400)

Trivial merge