Merge branch 'master' into 3.0 3.0.0
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 11 Nov 2010 12:53:42 +0000 (13:53 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 11 Nov 2010 12:53:42 +0000 (13:53 +0100)
commit4b1e99839f61efa61eb194467f8ef1acd3a5e32c
tree16280208c5ba2bc378d2de5cd02815625554cee0
parentc4e5a7dc0720e316df37f2ad9f0f1fce3873a52e
parent33ea51a6202ec4f1414b631cf7c9a301ecea9938
Merge branch 'master' into 3.0