SpringSource/spring-framework — pull request #135 by twicksell (2012-09-03 13:48:52+00:00)
Title: Proposed fix for SPR-8097

Resubmitting pull request for SPR-8097 with some test case fixes and squashed commits.

I have signed and agree to the terms of the SpringSource Individual Contributor License Agreement.