scala/scala — pull request #3555 by adriaanm (2014-02-18 23:38:38+00:00)
Title: Small Predef cleanup

Rebased and improved #3553's fix for SI-8229.
Also rename Predef.conforms to Predef.$conforms so it can't accidentally be shadowed.