Merge branch 'master' into 0.11

Conflicts:
	ext/pango/gsttextoverlay.c
This commit is contained in:
Wim Taymans 2011-08-22 13:14:49 +02:00
commit 860782337c

Diff content is not available