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

Trivial merge