Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 14 Dec 2010 15:14:44 +0000 (16:14 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 14 Dec 2010 15:14:44 +0000 (16:14 +0100)
commit47de3df6069296ba142cf6bd43e65e2ac484fbab
tree6296dfbe8c4a9b5fe273abd0615cdf7fff61bcea
parent3b39f8eba7740ada48af5e3b6e7b1aaa59e3356e
parent687ca636ffffc4487d115dc6a41099aa41a839b0
Merge branch 'master' into experimental