Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Sun, 7 Nov 2010 09:37:09 +0000 (10:37 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Sun, 7 Nov 2010 09:37:09 +0000 (10:37 +0100)
commit4bf3bbeedefaaed80b06b870c63cd38c5d0daf09
tree429c62d21d5e50df11dbbeda003e3cb2c2ba3a77
parentfa14cbb8b58a202b54557f9ef9b2b31a0128ecfc
parent4ed3a1ba4db2e01d717149e350e867d23cdd1b7b
Merge branch 'master' into experimental