Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 14 Dec 2010 15:14:44 +0000 (16:14 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 14 Dec 2010 15:14:44 +0000 (16:14 +0100)

Trivial merge