Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 6 Oct 2011 12:05:42 +0000 (14:05 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 6 Oct 2011 12:05:42 +0000 (14:05 +0200)
commite83fb140d5c6f4f7cc69ba5ebe57b105c1e0ee5b
tree2f97996ba91beda3209862f56aabbd861471f0e9
parente82262969c1389ffb37478f7932669e08b42c072
parent9c221f492db412093086b5643abebb65fd0febf3
Merge branch 'master' into 0.11