Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 25 Aug 2011 10:54:42 +0000 (12:54 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 25 Aug 2011 10:54:42 +0000 (12:54 +0200)
commit39b0b4e27f599c4e75060436e6a84d5f9400e171
treeebf95d7b977678c5e92478a274fba10869f11904
parent957043ad0a1503446d9ef64861d340e018be6220
parenta09bad4d98f513149c4e29c97f82c1b49d583fda
Merge branch 'master' into 0.11