scala/scala — pull request #658 by odersky (2012-06-02 21:11:19+00:00)
Title: Fix for SI-5399.

Closes t5399. Review by @adriaanm.