Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 4 Nov 2010 23:17:10 +0000 (00:17 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 4 Nov 2010 23:17:10 +0000 (00:17 +0100)

Trivial merge