Restore compile dependencies in generated POMs

Ensure that merge projects do not downgrade the compile time
dependencies of the projects that they are merged into.

This commit restores the scope of the following dependencies which
were inadvertently changed between Spring 3.2.0 and 3.2.1:

    spring-orm
    -> spring-tx
    -> spring-jdbc

    spring-webmvc
    -> spring-context
    -> spring-web

    spring-test
    -> spring-webmvc

Issue: SPR-10218
Fix typo in new-in-3.2.xml document

This commit fixes a typo in the "New Features and Enhancements in Spring
Framework 3.2" chapter of the reference manual. Specifically,
ContentNegotiationStrategy is now spelled correctly.
Merge pull request #221 from kdombeck/fix-typo

# By Ken Dombeck
* fix-typo:
  Fix typo in new-in-3.2.xml document
Merge branch '3.2.x' of git://github.com/SpringSource/spring-framework into SPR-10216