Merge pull request #126 from nperrier/master

build.xml improvements