Merge remote-tracking branch 'origin/master' into wip-2.10.0-RC1-∂π

- currently cheating: uses zeroMQ artifacts for scala 2.10M7
- fixed a bunch of more wrong references to scala.concurrent.util

akka-docs/rst/common/code/docs/circuitbreaker/DangerousJavaActor.java

@@ -8,7 +8,7 @@ package docs.circuitbreaker;
 import akka.actor.UntypedActor;
 import scala.concurrent.Future;
 import akka.event.LoggingAdapter;
-import scala.concurrent.util.Duration;
+import scala.concurrent.duration.Duration;
 import akka.pattern.CircuitBreaker;
 import akka.event.Logging;
 

akka-docs/rst/common/code/docs/duration/Java.java

@@ -5,15 +5,15 @@
 package docs.duration;
 
 //#import
-import scala.concurrent.util.Duration;
-import scala.concurrent.util.Deadline;
+import scala.concurrent.duration.Duration;
+import scala.concurrent.duration.Deadline;
 //#import
 
 class Java {
   public void demo() {
     //#dsl
     final Duration fivesec = Duration.create(5, "seconds");
-    final Duration threemillis = Duration.parse("3 millis");
+    final Duration threemillis = Duration.create("3 millis");
     final Duration diff = fivesec.minus(threemillis);
     assert diff.lt(fivesec);
     assert Duration.Zero().lt(Duration.Inf());