Merge commit '4fd027028b9d32767201dd4e8ec34edf7aa1366e' into experimental
authorFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 14 Feb 2011 08:02:01 +0000 (09:02 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 14 Feb 2011 08:02:01 +0000 (09:02 +0100)

Trivial merge