Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 26 Sep 2011 20:31:17 +0000 (22:31 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 26 Sep 2011 20:31:17 +0000 (22:31 +0200)
commit1e68f2d312b70cfd4fe663509d91c55a6d62bb0f
treeaa54f5a6351ff37fff4089c50c8f5b1a4d922d79
parent33180df8ba73957fcfec6579a7dee6dbf27cc2de
Merge branch 'master' into 0.11