Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 6 Sep 2011 14:13:28 +0000 (16:13 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 6 Sep 2011 14:13:28 +0000 (16:13 +0200)
commit33180df8ba73957fcfec6579a7dee6dbf27cc2de
treeaa54f5a6351ff37fff4089c50c8f5b1a4d922d79
parentdd6de226a817f20ac22875d337835b538c12a281
Merge branch 'master' into 0.11