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)
commitac065de0aa482d630e41ba80ccdc5ef617e7e378
tree943ef524363159fb1fe74816dee24369ebb23464
parentd6b8ff865af5c59b109c7e6ede3868db11e46f7d
parent01da0bdcc7d4043dbab99ad19443e5860c72da79
Merge branch 'obi/master' into experimental