Merge branch 'master' into m2ts_test
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 12 Nov 2010 18:56:05 +0000 (19:56 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 12 Nov 2010 18:56:05 +0000 (19:56 +0100)

Trivial merge