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