scala/scala — pull request #1512 by paulp (2012-10-19 16:09:05+00:00)
Title: Merge 2.10.x into master.

These merges become more "interesting" all the time. I had to resolve a scaladoc conflict with no real idea about the resolution. We need some more natural way to put that kind of work in front of the people who wrote the conflicting code, and which doesn't block the whole repository from merging. In any case, I took a stab at it.