Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Feb 2012 09:53:56 +0000 (10:53 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Feb 2012 09:53:56 +0000 (10:53 +0100)
commit2d6dfd5b316596616e99d4dea4caf3593e4bf4f3
tree52807d13d89377f51b2d4ff17ed7f3d7ae1e073c
parent18899cf94dc753862bdbf1e03ef141e6e286e6ec
parent1fe69911a4b4a2097c5131cdb377a8b63c4a4790
Merge branch 'master' into 0.11