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.

org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodesFactory.java

@@ -103,6 +103,7 @@ public class SQLErrorCodesFactory {
 			DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 			lbf.setBeanClassLoader(getClass().getClassLoader());
 			XmlBeanDefinitionReader bdr = new XmlBeanDefinitionReader(lbf);
+			// TODO: SPR-7508 consider setEnvironment() here
 
 			// Load default SQL error codes.
 			Resource resource = loadResource(SQL_ERROR_CODE_DEFAULT_PATH);