Merge branch 'master' into 3.0
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 5 Nov 2010 18:42:27 +0000 (19:42 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 5 Nov 2010 18:42:27 +0000 (19:42 +0100)
commit7f092da014b616004d07fc27e567d1d6f096d15b
tree5792a418218e9644af2e730e6404975cd7990550
parentc9fc2db8f1829ec65482487070722194ddc0fcf4
parent3238fce693dbe855e0e75b40eb26c883e940403d
Merge branch 'master' into 3.0