scala/scala — pull request #621 by axel22 (2012-05-25 07:38:09+00:00)
Title: Fixes SI-5085 and SI-4833.

Review by @phaller.