Merge 3.1.0 development branch into trunk

Branch in question is 'env' branch from git://git.springsource.org/sandbox/cbeams.git; merged into
git-svn repository with:

    git merge -s recursive -Xtheirs --no-commit env

No merge conflicts, but did need to

    git rm spring-build

prior to committing.

With this change, Spring 3.1.0 development is now happening on SVN
trunk. Further commits to the 3.0.x line will happen in an as-yet
uncreated SVN branch.  3.1.0 snapshots will be available
per the usual nightly CI build from trunk.

.gitignore

@@ -1,7 +1,11 @@
 target
 integration-repo
 ivy-cache
-spring-build
 jmx.log
 .springBeans
 .DS_Store
+*.sw*
+org.springframework.test/test-output/
+build.sh
+org.springframework.beans/.settings/org.springframework.ide.eclipse.beans.core.prefs
+org.springframework.beans/.settings/org.springframework.ide.eclipse.core.prefs