scala/scala — pull request #1604 by paulp (2012-11-10 04:36:53+00:00)
Title: Fix merge error.

I fixed that already and somehow it didn't appear in my push.