scala/scala — pull request #1313 by odersky (2012-09-16 15:29:22+00:00)
Title: Fixes SI-6260 

and also has a small cleanup for OverridingPairs. Review by @paulp @retronym