Upgrade to Spring 3.1.2 and 1.3/0.8 snapshots.