update to scala 2.10
merge