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)
commitcbb3c6e0193de78307a4c5645e51020bf6c7136d
treeaa54f5a6351ff37fff4089c50c8f5b1a4d922d79
parentf2a86068a963d4ef51fe422988d842b7fb92ada6
Merge branch 'master' into 0.11