Fix 0.9.x build on Scala 2.10.x
Merge pull request #220 from scala/fix-build-0.9.x-2.10

Fix 0.9.x build on Scala 2.10.x