Fix invalid XHTML to allow i18n machinery to work
Merge pull request #942 from eucalyptus/i18n_fixes

Fix invalid XHTML to allow i18n machinery to work