scala/scala — pull request #1368 by paulp (2012-09-20 22:09:41+00:00)
Title: Merge 2.10.x into master

The merge pain is accelerating at a disturbing rate.