Merge branch 'master' into 2.7
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 5 Jan 2010 17:52:12 +0000 (18:52 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 5 Jan 2010 17:52:12 +0000 (18:52 +0100)

Trivial merge