Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 17 Feb 2012 08:01:56 +0000 (09:01 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 17 Feb 2012 08:01:56 +0000 (09:01 +0100)
commitbbf956433f59b48714243e9852b3323d75bbfb44
treee5d9973f871541134db56b09bad8fe04d0d7590e
parentaa6b23fc44831f3b4203c18bc713ac6dcc5712d8
parent81b71b65ee028ffcfd98ccfec52602e463c91c0a
Merge branch 'master' into 0.11