Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 4 Nov 2010 23:17:10 +0000 (00:17 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 4 Nov 2010 23:17:10 +0000 (00:17 +0100)
commit14aab9b5a3cced3ce195266d430408afdd3161a4
tree4296c49aa8ab75c00ad2d201870442360f46adc5
parentcf49a12693ed975f55b47284ef03e49f7b025268
parent7fd4241a1d7b8d7c36385860b24882636517473b
Merge branch 'master' into experimental