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