upgrade to Scala 2.10.0-M4
source changes so we compile in Scala 2.10.0-M4
tweaks to get compiling with Scala 2.10
use newer ScalaTest build
tweaks to get compiling under Scala 2.10
newer ScalaCheck build (that actually works)
build fixes for Scala 2.10
Merge remote-tracking branch 'origin/master' into scala-2.10
Merge remote-tracking branch 'origin/master' into scala-2.10

Conflicts:
	Makefile
	bin/scalac
	bin/scaladoc
	build.sbt
insert typecast necessary to avoid runtime exception on Scala 2.10

at least, it's necessary as of 2.10.0-M4
Merge remote-tracking branch 'origin/master' into scala-2.10
make a few 2.10 warnings go away
upgrade to Scala 2.10.0-M5
tweak necessary on Scala 2.10 (scala.Either moved)
work around SI-6049 for 2.10 (but actually the new code is better anyway)
temporary workaround for SI-6049 in Scala 2.10.0-M5
work around SI-6063 by converting NonLocalExit back to Java
benchmark dumps for scala-2.10 branch
Merge remote-tracking branch 'origin/master' into scala-2.10

Conflicts:
	bin/release.sh
	project/proguard/hubnet.txt
	project/proguard/lite.txt
	project/proguard/main.txt
temporarily disable some tests failing on Scala 2.10.0-M5

because of https://issues.scala-lang.org/browse/SI-5974