J. J. Ramsey - 2004-05-08

Patch w/ fixes for XHTML suitability (updated)