Merge branch '2.6'
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 20 Nov 2009 11:36:55 +0000 (12:36 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 20 Nov 2009 11:36:55 +0000 (12:36 +0100)

Trivial merge