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)
commit01da0bdcc7d4043dbab99ad19443e5860c72da79
tree0cc197b699cd13646d7c6b294c204d056abcf27d
parent30d08880e13f81aa3aa6cb163e2037d1b98e20e4
parented545659e30ea7796e2e7acd06e766cc82efb486
Merge branch 'master' into obi/master