Fix problem with build.xml caused by merge.