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

Trivial merge