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.context/src/test/java/example/profilescan/ProfileAnnotatedComponent.java

@@ -0,0 +1,13 @@
+package example.profilescan;
+
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+
+@Profile(ProfileAnnotatedComponent.PROFILE_NAME)
+@Component(ProfileAnnotatedComponent.BEAN_NAME)
+public class ProfileAnnotatedComponent {
+
+	public static final String BEAN_NAME = "profileAnnotatedComponent";
+	public static final String PROFILE_NAME = "test";
+
+}