scala/scala — pull request #969 by paulp (2012-07-22 05:27:46+00:00)
Title: Merge 2.10.x

Since #950 created conflict between master and 2.10.x, I merged 2.10.x into master and offer it here.