scala/scala — pull request #2483 by adriaanm (2013-05-02 11:25:08+00:00)
Title: Merge 2.10.x

review by @paulp, please