Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 3 Oct 2011 09:24:04 +0000 (11:24 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 3 Oct 2011 09:24:04 +0000 (11:24 +0200)
commitd26f7319e9e32968bcb43c68304bdf524e36f1f8
treef7bec8caeae94fbf09c7fe221432dcd14db8b2d3
parentae198fa2094a93d0652eeb51c811116b7a8385d8
parentfa3d6610833b4b92574a2ef8be870c93b527c5f1
Merge branch 'master' into 0.11