Roland 42769599aa Merge branch 'ticket955' ... Conflicts: akka-actor-tests/src/test/scala/akka/actor/supervisor/Ticket669Spec.scala akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala akka-camel/src/test/scala/akka/camel/ConsumerScalaTest.scala		2011-07-19 16:56:44 -04:00
..
src	Merge branch 'ticket955'	2011-07-19 16:56:44 -04:00