Merge remote branch 'origin/master' into logging

BalancingDispatcherModelSpec is currently broken, leaves count==1 in
wavesOfActors test, committed anyway in order to check out where it
broke before this merge

akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala

@@ -65,7 +65,7 @@ import akka.AkkaApplication
  */
 class Dispatcher(
   _app: AkkaApplication,
-  _name: String,
+  val name: String,
   val throughput: Int,
   val throughputDeadlineTime: Int,
   val mailboxType: MailboxType,
@@ -73,8 +73,6 @@ class Dispatcher(
   val timeoutMs: Long)
   extends MessageDispatcher(_app) {
 
-  val name = "akka:event-driven:dispatcher:" + _name
-
   protected[akka] val executorServiceFactory = executorServiceFactoryProvider.createExecutorServiceFactory(name)
   protected[akka] val executorService = new AtomicReference[ExecutorService](new LazyExecutorServiceWrapper(executorServiceFactory.createExecutorService))
 
@@ -153,4 +151,4 @@ abstract class PriorityGenerator extends java.util.Comparator[Envelope] {
 
   final def compare(thisMessage: Envelope, thatMessage: Envelope): Int =
     gen(thisMessage.message) - gen(thatMessage.message)
-}
+}