Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 4 Aug 2011 07:40:46 +0000 (09:40 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 4 Aug 2011 07:40:46 +0000 (09:40 +0200)
commit2ba07782cd43e1c2d3efa47ef8d4ff7403a737ea
tree021461474600c9d56d1fa94da23079f18ca2ad7e
parent01b9b5002fb057604855dffc9faac4903df4b8d7
parent9238647314b2e6cca6cbb9458eb3df956fea27de
Merge branch 'master' into 0.11