[scala/f13/master: 3/3] Merge branch 'master' into f13/master

[Geoffrey Reedy]

commit e1f0630ea7361d84f2e9ecb8ea35d3b86854f13d
Merge: 8abb236 65f0d99
Author: Geoff Reedy <geoff at programmer-monk.net>
Date:   Mon Aug 16 22:11:09 2010 -0600

    Merge branch 'master' into f13/master

 scala-2.8.0-fix3716.patch          |   12 ++++
 scala-2.8.0-tooltemplate.patch     |   74 ++++++++++++++++++++++++
 scala-2.8.0-use_system_jline.patch |   28 +++++++++
 scala.spec                         |  110 ++++++++++++++----------------------
 sources                            |    4 +-
 5 files changed, 158 insertions(+), 70 deletions(-)
---