Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 8 Nov 2010 15:31:42 +0000 (16:31 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 8 Nov 2010 15:31:42 +0000 (16:31 +0100)

Trivial merge