Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 11 Mar 2011 08:24:59 +0000 (09:24 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 11 Mar 2011 08:24:59 +0000 (09:24 +0100)

Trivial merge