Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 16 Nov 2010 14:28:32 +0000 (15:28 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 16 Nov 2010 14:28:32 +0000 (15:28 +0100)
commit7d6ff22b6dd5b0f7b35fb35747109d70b6324d3e
tree2cf92a22975052779b4cd6ad19f73aafd77adcad
parentbddf5dc4d95831ef714ab55e2f47b1ac114ebe01
parentfb91533bb1d293bdb0691bfcc1d15da9268782fe
Merge branch 'master' into experimental