Merge branch 'bug_689_projectx_subs' into experimental
authorFraxinas <andreas.frisch@multimedia-labs.de>
Thu, 3 Mar 2011 23:06:32 +0000 (00:06 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Thu, 3 Mar 2011 23:06:32 +0000 (00:06 +0100)

Trivial merge