Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 28 Feb 2011 11:12:51 +0000 (12:12 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 28 Feb 2011 11:12:51 +0000 (12:12 +0100)
commit73f2667ff2b0f8899a08e9a49e2c6ef4cf6192a3
treef0ba71b900fae2477f9367f13ca1f5f94f7bb048
parent5a6c22ef5559871bed918fa71a7f22f7a2717a6f
parent32ca9c111b511376f86c375463f2ff02d0400f96
Merge branch 'master' into 0.11

Conflicts:
configure.ac
configure.ac