scala/scala — pull request #1220 by paulp (2012-08-31 01:27:30+00:00)
Title: Merge 210

Merge 2.10.x into master.