Merge pull request #1 from SpringSource/master

dd