This commit was manufactured by cvs2svn to create tag 'gtkhtml-3-3-merge'. svn path=/tags/gtkhtml-3-3-merge/; revision=7563