Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 22 Aug 2011 11:14:49 +0000 (13:14 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 22 Aug 2011 11:14:49 +0000 (13:14 +0200)
commit860782337c733f03c5891716a31a6fba3be0ddcb
tree5ee3df33e8816f90bbad47c9dc936300156e4613
parent3fab57b5cf84180cbf95600071349e19214a9df0
parent7d3858a14da8e3b9ec6a36e9c2e5c627e77b9df6
Merge branch 'master' into 0.11

Conflicts:
ext/pango/gsttextoverlay.c