Switching to Spring 3.0.5