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.integration-tests/src/test/resources/log4j.xml

@@ -15,6 +15,10 @@
 		<level value="warn" />
 	</logger>
 
+	<logger name="org.springframework.beans.factory.xml.XmlBeanFactory">
+		<level value="error" />
+	</logger>
+
 	<logger name="org.springframework.binding">
 		<level value="debug" />
 	</logger>
@@ -25,4 +29,4 @@
 		<appender-ref ref="console" />
 	</root>
 	
-</log4j:configuration>
+</log4j:configuration>