Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 26 Mar 2012 10:20:51 +0000 (12:20 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 26 Mar 2012 10:20:51 +0000 (12:20 +0200)
commit37bbf2317b0a485d1bb530e37f5fb6480b9e60a9
treed030fe369930f96bd8763a42fd8ba7d0abe1a6ba
parente0be150e9198c8d39abdaad4003916b9d9989502
parent3c768123b4d60618e1197b902de956cb251dbfb0
Merge branch 'master' into 0.11