scala/scala — pull request #258 by dragos (2012-03-03 15:40:40+00:00)
Title: Fix for cps regression. 

Closes 5538. Closes 5445. (cherry picked from commit 9f5767dd31395cac0bc64c86c2cacf247b1924fa)