Conflicts: ext/pango/gsttextoverlay.c ext/pango/gsttextoverlay.h
This prevents the ugly hack where the text_sink pad template was only added for textoverlay but not for the subclasses. Also makes this work with the core change that made subclasses inherit the templates of their parent class.