Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Sat, 11 Dec 2010 11:38:36 +0000 (12:38 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Sat, 11 Dec 2010 11:38:36 +0000 (12:38 +0100)

Trivial merge