Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Sun, 7 Nov 2010 09:37:09 +0000 (10:37 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Sun, 7 Nov 2010 09:37:09 +0000 (10:37 +0100)

Trivial merge