cross build against 2.10.0-RC2
cross build against Scala 2.10.0-RC5
Merge remote-tracking branch 'upstream/master'

Conflicts:
	build.sbt