Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 20 Nov 2009 11:42:05 +0000 (12:42 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 20 Nov 2009 11:42:05 +0000 (12:42 +0100)

Trivial merge