Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 4 Nov 2010 16:25:46 +0000 (17:25 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 4 Nov 2010 16:25:46 +0000 (17:25 +0100)
commitcf49a12693ed975f55b47284ef03e49f7b025268
treee00a2c764807d6beaa47d63c543ced07bcdc3c59
parent1f65ad77eb4ec34015b873d5327a6f91dadbdb70
parent7709c1d61e799fa06a257f1d6b9c23ae205fe0c9
Merge branch 'master' into experimental