Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 10 Oct 2011 12:08:29 +0000 (14:08 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 10 Oct 2011 12:08:29 +0000 (14:08 +0200)
commit632588b3d969cdbef343262579ea94c249c8d0cc
tree0d85c553d0b75924500f360cc908f920bc1fd232
parent0577e069c22648cae9e4951c84ad3602b0ac217c
parent4b06e3095a2aac5b81f931677ce539d715139989
Merge branch 'master' into 0.11