merging to r767631 from maven-2.1.x branch for MNG-4074

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/maven-2.2.x@767940 13f79535-47bb-0310-9956-ffa450edef68
2 files changed