scala/scala — pull request #775 by phaller (2012-06-26 10:16:44+00:00)
Title: Fix for SI-5977

Closes SI-5977.

Review by @adriaanm