merged xml-lib/ into common/