prepare to scala 2.10.0 upgrade