Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 5 Nov 2010 19:50:47 +0000 (20:50 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 5 Nov 2010 19:50:47 +0000 (20:50 +0100)
commitfa14cbb8b58a202b54557f9ef9b2b31a0128ecfc
tree879c5c61d1ff8795f241f67092d31f03888bce35
parented03f92207bff89ff55c6547d0cbfd7806d18149
parentf4fb876e88bdd4ce3672a484d16ed6991c25cbba
Merge branch 'master' into experimental