Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 13 Jun 2011 17:08:38 +0000 (19:08 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 13 Jun 2011 17:08:38 +0000 (19:08 +0200)
commitfdd93fa85dbf3cc81fd26868c5282a75198b9da8
tree7351c4d60c9528d4a1f72ebe1a95682ba5b9e1ce
parent409f29700d3389804b9620fe140710a15d73ede5
parent4f15c9e30e03f7ed39744c3b02e001727a5ba29e
Merge branch 'master' into 0.11