Merge branch 'master' into 3.0
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 15 Nov 2010 20:10:22 +0000 (21:10 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 15 Nov 2010 20:10:22 +0000 (21:10 +0100)
commita99a91815b5b9b09e06dbc79e7a8cf7e1d3911ab
tree6dac38a9ba9831e6b063f879caead50fa68d6c8e
parent25cd1a7f5232f31b7e9dc6f36daebcf1c03196f1
parent53c44df02c114d2160fc35c304d278ca3e54e7bd
Merge branch 'master' into 3.0