Merge branch 'master' into 3.0
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 4 Nov 2010 16:25:52 +0000 (17:25 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 4 Nov 2010 16:25:52 +0000 (17:25 +0100)

Trivial merge