Merge branch 'master' into obi/master
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 24 Nov 2010 17:06:03 +0000 (18:06 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 24 Nov 2010 17:06:03 +0000 (18:06 +0100)

Trivial merge