merging r1306539 and r1306540


git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/ivyde/branches/2.2.0.beta1@1306541 13f79535-47bb-0310-9956-ffa450edef68