scala/scala — pull request #2124 by adriaanm (2013-02-13 06:18:36+00:00)
Title: merge 2.10.x

review by @gkossakowski