get ant back for tests
Merge branch 'jruby-1_7' of jruby.org:jruby into jruby-1_7