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)
commit62544179e29235a047f0b9d03859bdb904c86e34
tree24333f0d21c1db1362bb6d6fb7b4a6d53018b47e
parent9f738908929388464c950b1e45d427eae69268d6
parent506f97a97538f1949afb6cb72700c8685c1cb00a
Merge branch 'master' into 0.11