Merge commit 'e8eb8e9694379204' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 22 Dec 2009 14:56:53 +0000 (15:56 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 22 Dec 2009 14:56:53 +0000 (15:56 +0100)
commit089c965d09e2af09a4731ff164e1b68b3daf8047
treef7fcc1a132b54fa46ae47421cfffa4af9b8c7814
parent41b99d4a2d737817b75c93c8331f038326d13862
parente8eb8e9694379204f4b9143ca6b33db48809df7f
Merge commit 'e8eb8e9694379204' into experimental