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

Trivial merge