bug 2576 - fix XHTML validation errors generated by previous commit