Merge ../Core
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:tBoneTV/ZeeboxCore
Merge pull request #1 from tBoneTV/kj-change-metrics-to-numbers

Changed metrics to be numbers
Merge pull request #2 from kevinwright/master

brutally ripped out commons logging, kicking and screaming!
Merge branch 'v0.2'
Merge branch 'master' of github.com:tBoneTV/ZeeboxCore
Merge branch 'httpserver2'

Conflicts:
	akka/src/main/scala/com/zeebox/core/akka/future/FutureW.scala
	akka/src/main/scala/com/zeebox/core/util/AsyncService.scala
	http/http-client/src/main/scala/com/zeebox/core/http/client/HttpClient.scala
	http/http-server/src/main/scala/com/zeebox/core/http/server/HttpServer.scala
	http/http-server/src/test/scala/com/zeebox/core/http/server/HttpResourceTest.scala
	http/http-server/src/test/scala/com/zeebox/core/http/server/HttpServerTest.scala
	http/http-server/src/test/scala/com/zeebox/core/http/server/RestClient.scala
Merge branch 'master' of github.com:tBoneTV/ZeeboxCore
Merge branch 'scala210rc1'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:tBoneTV/ZeeboxCore
Merge branch 'master' of github.com:tBoneTV/ZeeboxCore
Merge branch 'master' into iteratee2
Merge branch 'master' of github.com:tBoneTV/ZeeboxCore
Merge branch 'support-for-throttlerequestfilter'

Conflicts:
	http/http-client/src/main/scala/com/zeebox/core/http/client/HttpClient.scala
Merge branch 'master' of github.com:zeebox/ZeeboxCore
Merge pull request #3 from cjwebb/master

Http Stats created via gauge for every Http Request
Merge branch 'master' of github.com:zeebox/ZeeboxCore
Merge branch 'master' of github.com:zeebox/ZeeboxCore