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