Merge branch 'master' into experimental
authorFraxinas <andreas.frisch@multimedia-labs.de>
Tue, 4 Jan 2011 12:45:52 +0000 (13:45 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Tue, 4 Jan 2011 12:45:52 +0000 (13:45 +0100)

Trivial merge