Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 4 Nov 2011 10:01:42 +0000 (11:01 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 4 Nov 2011 10:01:42 +0000 (11:01 +0100)
commit03dc5e7119b8cb7e19b40b16f5a588b6d0bf7895
tree44062ada764a50736faa0fd584f425bc1ead5091
parent4e5da3c213451d4dbf282480d24733d476aa69aa
Merge branch 'master' into 0.11