WIP: It compiles, minus Swagger (unpublished for 2.10). Some tests fail.
All core tests now passing under Scala 2.10.0-RC2.
Fix AkkaSupport by making HaltException not a ControlThrowable.

Control Throwables are treated as fatal, and no longer set as a
failure on the future.  We'll make it a plain Throwable and hope
people have the good taste to not catch it.
Enable cross path.
WIP: try to compile scalatra-swagger again.
Make scalatra-swagger and scalatra-swagger-ext compile and pass tests.
Merge branch 'develop' into scala-2.10
Build for Scala 2.10.0-RC3.

Scalate and Swagger still using RC2 until RC3 builds are available.
Tests passed, but this might blow up in more rigorous usage.
Update Scalate and Swagger to Scala 2.10.0-RC3 builds.
Merge branch 'develop' into scala-2.10

Conflicts:
	project/build.scala
	swagger/src/main/scala/org/scalatra/swagger/Swagger.scala
Fix compile error in Swagger.

Still don't know why we can't just collect over s.endpoints.  This
needs deeper study.
Bump to Scala 2.10.0-RC5.

Using RC3 builds of Scalate and Json4s.  Fix once published.
2.2.x branch should be version 2.2.x.
Revert upgrades to RC5 for deps not yet crosspublished.
ensure jsonp callbacks are fully written to the output stream
Merge branch '2.2.x' into 2.2.x_2.10.

TODO: There seems to be more divergence between atmosphere packages than is
necessary.  But this runs clean.

Conflicts:
	atmosphere/src/main/scala/org/scalatra/atmosphere/AtmosphereClient.scala
	project/build.scala
Upgrade to Scala 2.10.

TODO: Scalaz6 not published yet.  Pinned to 2.10.0-RC5 for now.
Merge branch '2.2.x' into 2.2.x_2.10

Conflicts:
	project/build.scala
Merge branch '2.2.x_2.10' into develop_2.10

Conflicts:
	commands/src/main/scala/org/scalatra/commands/CommandSupport.scala
Merge branch '2.2.x' into 2.2.x_2.10