[bknr-cvs] r1844 - branches/xml-class-rework