Remove and reapply changes that gocher made in changeset:217 to provide reduced diff from changeset:213 
Remove and reapply changes that gocher made in changeset:217 to provide reduced diff from changeset:213 

Please people be careful not to introduce spurious changes, especially for the ENTIRE FILE.



git-svn-id: ffc8153a6dc1bd3190771e281f3ecc84ffdca780@230 bdcdd039-d5ef-0310-875c-f7949af66bfe

xinha/xinha-svn-mirror,xinha/xinha-svn-mirror,xinha/xinha-svn-mirror,xinha/xinha-svn-mirror