Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 16 Nov 2009 10:06:21 +0000 (11:06 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 16 Nov 2009 10:06:21 +0000 (11:06 +0100)

Trivial merge