Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 7 Nov 2011 09:02:00 +0000 (10:02 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 7 Nov 2011 09:02:00 +0000 (10:02 +0100)
commit5e8fd1b875a5740a22c110a2172bdabf1987403d
tree44062ada764a50736faa0fd584f425bc1ead5091
parent03dc5e7119b8cb7e19b40b16f5a588b6d0bf7895
Merge branch 'master' into 0.11