Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Sat, 11 Dec 2010 11:38:36 +0000 (12:38 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Sat, 11 Dec 2010 11:38:36 +0000 (12:38 +0100)
commit33f552537bd880961256142b7a8f742a5681144e
treeeff6e6b486894900f29532a89c89e6ee82a8e7db
parent83e780aa14c8f51c89ff80c7ac2b67de5b8dc3b8
parentc33214ce30a9caa31bccfb88c629cd30a0b58635
Merge branch 'master' into experimental