Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 20 Nov 2009 11:42:05 +0000 (12:42 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 20 Nov 2009 11:42:05 +0000 (12:42 +0100)
commite90006f23e9a87b65a3fbb8b5abf5f6b4432817c
treef490fd4c59f3a926ec21e077bdcee49a7e481c0e
parent47632b77b9955576d6b1352f337b2a86bd480695
parentaf92de73a0f40ca4a5d3026672b12345b71682cc
Merge branch 'master' into experimental