scala/scala — pull request #1794 by paulp (2012-12-20 22:50:07+00:00)
Title: Merge 2.10.x into master.

Another fun-filled day at the carmergival.