[scala-2.10] 68/166: Merge commit 'upstream/2.9.0.1.dfsg'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository scala-2.10.

commit 63882df22fcb8736141d0c1aceb2d420ffab7f4a
Merge: 18500c7 f1ebd6c
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Jun 23 22:27:37 2011 +0200

    Merge commit 'upstream/2.9.0.1.dfsg'

 META-INF/MANIFEST.MF                               |  2 +-
 build.number                                       |  2 +-
 build.xml                                          |  4 ++--
 src/compiler/scala/tools/nsc/ast/TreeGen.scala     | 22 ++++++++++++++--------
 .../scala/tools/nsc/transform/CleanUp.scala        | 12 ++++++------
 .../scala/tools/nsc/typechecker/Typers.scala       |  7 +++++--
 src/library/scala/collection/TraversableOnce.scala |  7 ++++++-
 .../scala/collection/TraversableViewLike.scala     |  8 +++++---
 .../generic/GenericTraversableTemplate.scala       |  2 +-
 .../scala/collection/immutable/MapLike.scala       | 11 ++++++++++-
 src/library/scala/collection/immutable/Range.scala |  4 ++--
 .../scala/collection/immutable/SortedMap.scala     | 17 +++++++++++++++--
 src/library/scala/runtime/RichInt.scala            |  8 ++++----
 test/files/neg/bug4533.check                       |  2 +-
 test/files/run/bug4558.scala                       |  6 ++++++
 test/files/run/bug4617.check                       |  1 +
 test/files/run/bug4617.scala                       | 15 +++++++++++++++
 test/files/run/t4560.check                         |  1 +
 test/files/run/t4560.scala                         | 16 ++++++++++++++++
 test/files/run/t4608.scala                         | 11 +++++++++++
 20 files changed, 123 insertions(+), 35 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git