Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 18 May 2011 11:19:31 +0000 (13:19 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 18 May 2011 11:19:31 +0000 (13:19 +0200)
commit6ad530a8b08fa75fa67c1869f95ab80c8d86af5e
tree05d68f76402881868306539634a24d721208659e
parente39182a08580e723093c478017650889b5e9a0f4
parent0df5f9abb93cf72c89e394f1e1a2e1a0d0075488
Merge branch 'master' into 0.11