scala/scala — pull request #642 by dragos (2012-05-30 12:34:57+00:00)
Title: Backport for presentation compiler bug SI-5708

Cherry-picked from master. Review by @odersky, @hubertp.