Merge commit '9cdbe28' into merge/2.10.x-to-master

Conflicts:
	build.examples.xml
	build.xml
	docs/examples/actors/pingpong.scala
	docs/examples/fors.scala
	docs/examples/iterators.scala
	docs/examples/jolib/Ref.scala
	docs/examples/jolib/parallelOr.scala
	docs/examples/monads/callccInterpreter.scala
	docs/examples/monads/directInterpreter.scala
	docs/examples/monads/errorInterpreter.scala
	docs/examples/monads/simpleInterpreter.scala
	docs/examples/monads/stateInterpreter.scala
	docs/examples/parsing/ArithmeticParser.scala
	docs/examples/patterns.scala
	docs/examples/pilib/elasticBuffer.scala
	docs/examples/pilib/handover.scala
	docs/examples/pilib/piNat.scala
	docs/examples/typeinf.scala
	src/build/pack.xml

1 files changed, 0 insertions, 40 deletions

diff --git a/docs/examples/actors/message.scala b/docs/examples/actors/message.scala
deleted file mode 100644
index d385543470..0000000000
--- a/docs/examples/actors/message.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-package examples.actors
-
-import scala.actors.{Actor, Scheduler}
-import scala.actors.Actor._
-import scala.actors.scheduler.SingleThreadedScheduler
-
-object message {
-  def main(args: Array[String]) {
-    val n = try { args(0).toInt }
-    catch {
-      case _ =>
-        println("Usage: examples.actors.message <n>")
-        Predef.exit
-    }
-    val nActors = 500
-    val finalSum = n * nActors
-    Scheduler.impl = new SingleThreadedScheduler
-
-    def beh(next: Actor, sum: Int) {
-      react {
-        case value: Int =>
-          val j = value + 1; val nsum = sum + j
-          if (next == null && nsum >= n * j)
-            println(nsum)
-          else {
-            if (next != null) next ! j
-            if (nsum < n * j) beh(next, nsum)
-          }
-      }
-    }
-
-    def actorChain(i: Int, a: Actor): Actor =
-      if (i > 0) actorChain(i-1, actor(beh(a, 0))) else a
-
-    val firstActor = actorChain(nActors, null)
-    var i = n; while (i > 0) { firstActor ! 0; i -= 1 }
-
-    Scheduler.shutdown()
-  }
-}