scala/scala — pull request #1042 by paulp (2012-08-03 01:08:07+00:00)
Title: Merge 2.10.x

After that reflection commit it's conflict city.