port to scala 2.10.1.  Tests pass