Merging ant-nodeps.jar into ant.jar. Not at all sure that the POMs are now correct; very hard to tell with a monolithic source tree. Consolidation in manual to follow.