Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 2 Nov 2011 09:31:24 +0000 (10:31 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 2 Nov 2011 09:31:24 +0000 (10:31 +0100)
commit4e5da3c213451d4dbf282480d24733d476aa69aa
tree44062ada764a50736faa0fd584f425bc1ead5091
parent9a478090a2190f1ca89bd37db01567857d17aff4
Merge branch 'master' into 0.11