Merge remote-tracking branch 'origin/bug_689_projectx_subs'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 9 Mar 2011 13:56:28 +0000 (14:56 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 9 Mar 2011 13:56:28 +0000 (14:56 +0100)

Trivial merge