[bknr-cvs] r1855 - branches/xml-class-rework/thirdparty