scala/scala — pull request #318 by lrytz (2012-03-23 09:28:04+00:00)
Title: Undo the revert.

reverts 3db29dde051614d976bca92a1cdeb109c9c0ab01 and 5af2bf54d21ac63236cd6e68586b2c38fa0f28c3
restores 19a48510c2e18430a35319c04dfe3bad7119f23f