Javadoc ant task fixed.
Merge branch 'svn'