scala/scala — pull request #1962 by phaller (2013-01-24 07:32:35+00:00)
Title: Backport of SI-6932 to 2.9.x

Already reviewed and discussed, see https://github.com/scala/scala/pull/1941

Review by @adriaanm