Merge branch '32bpp_rgba_png_support'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 14 Sep 2011 20:50:27 +0000 (22:50 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 14 Sep 2011 20:50:27 +0000 (22:50 +0200)

Trivial merge