Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 8 Nov 2010 14:46:09 +0000 (15:46 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 8 Nov 2010 14:46:09 +0000 (15:46 +0100)

Trivial merge