scala/scala — pull request #1365 by paulp (2012-09-20 16:44:02+00:00)
Title: Pull 1352 reformatted

This is a rebase of #1352 on 2.10.x plus fixing the line lengths of martin's commit messages.