Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 5 Nov 2010 19:50:47 +0000 (20:50 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 5 Nov 2010 19:50:47 +0000 (20:50 +0100)

Trivial merge