Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 8 Nov 2010 15:31:42 +0000 (16:31 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 8 Nov 2010 15:31:42 +0000 (16:31 +0100)
commitcf6aaaa4d187c89a340d9c7250041b8bcb2acd17
tree9f5ab36578a7f920ec3cc074c412fdff377467b4
parent73a11b674396228ca45773dcda5709c1b1fd661f
parentee3d11136fecd16e62fae077a49f41381fa4e358
Merge branch 'master' into experimental