bump
Merge branch 'master' into scala-2.9.x

Conflicts:
	project/build.scala