scala/scala — pull request #749 by phaller (2012-06-19 15:10:52+00:00)
Title: Backport of fix for CPS ticket 1681

This is a backport of the fix for CPS ticket 1681 (see commit bf4b982389dcd573e81155bfe233f70f1471b017). For the record, this has already been reviewed by @adriaanm.