Merging changes up to revId 788569 from maven-2.2.0-RC branch.


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