Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 8 Nov 2010 14:46:09 +0000 (15:46 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 8 Nov 2010 14:46:09 +0000 (15:46 +0100)
commit73a11b674396228ca45773dcda5709c1b1fd661f
treed1f4646600e61112d5f52f12ae09a7902fe7ff5a
parente4490d366aac99fe87dadf1b12c981725f7adc19
parent3384cc02bbd5c05316ca98b3b27b15074f538d32
Merge branch 'master' into experimental