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, 17 deletions

diff --git a/docs/examples/futures.scala b/docs/examples/futures.scala
deleted file mode 100644
index e05b6b330e..0000000000
--- a/docs/examples/futures.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-package examples
-
-import concurrent.ops._
-
-object futures {
-  def someLengthyComputation = 1
-  def anotherLengthyComputation = 2
-  def f(x: Int) = x + x
-  def g(x: Int) = x * x
-
-  def main(args: Array[String]) {
-    val x = future(someLengthyComputation)
-    anotherLengthyComputation
-    val y = f(x()) + g(x())
-    println(y)
-  }
-}