Initial 2.x commit
xss security fix
Stripping CVS keywords
=#245582 by yngens: porting to D6 thanks to andypost
code style fixes
compliance with coder module minor warnings
port issues #233001, #233004, #233007, and #232992
feature #232992