Merge branch '2.6'
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 20 Nov 2009 11:36:55 +0000 (12:36 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 20 Nov 2009 11:36:55 +0000 (12:36 +0100)
commitaf92de73a0f40ca4a5d3026672b12345b71682cc
treecbaef40f71f225f7a1231b1e2566c79aed02c767
parent956c6f8437c02e4ed885728752589d26a7fcb97e
parent407fc8d63356aa4a9e419b9815984a3743c3a70a
Merge branch '2.6'