Merge commit 'e8eb8e9694379204' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 22 Dec 2009 14:56:53 +0000 (15:56 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 22 Dec 2009 14:56:53 +0000 (15:56 +0100)

Trivial merge