Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 30 Nov 2009 08:30:39 +0000 (09:30 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 30 Nov 2009 08:30:39 +0000 (09:30 +0100)
commit111874bbd87063dc52d061bde1d74694c5c5e092
treee58a6cf7e3be77c9d20bc2def934695ab84bae85
parent2013076d767842eba5ac94aaf3e58c94303d05e2
parentf21e64acc0fbdbcc248fee8054d3848a5680ddc3
Merge branch 'master' into experimental