Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 17 Aug 2011 17:01:39 +0000 (19:01 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 17 Aug 2011 17:01:39 +0000 (19:01 +0200)
commitdf00cae0be545210b2dbd7eeb39d9aaa0d741cb9
treeaa54f5a6351ff37fff4089c50c8f5b1a4d922d79
parentcbb3c6e0193de78307a4c5645e51020bf6c7136d
Merge branch 'master' into 0.11