Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 30 Nov 2009 08:30:39 +0000 (09:30 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 30 Nov 2009 08:30:39 +0000 (09:30 +0100)

Trivial merge