Merge branch 'master' into async_picload
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 17 Nov 2008 18:23:02 +0000 (19:23 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 17 Nov 2008 18:23:02 +0000 (19:23 +0100)

Trivial merge