Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 26 Mar 2012 10:22:05 +0000 (12:22 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 26 Mar 2012 10:22:05 +0000 (12:22 +0200)
commit244422cc949c03fc23b251006b58d82555526483
tree27af837e5042ee5e18c4ecf41ffee25750c42cd3
parent37bbf2317b0a485d1bb530e37f5fb6480b9e60a9
parentd1df0f3a2242edf4add833467aec84f3285079be
Merge branch 'master' into 0.11