Merge commit 'refs/pull/1574/head' into merge-210

* commit 'refs/pull/1574/head': (24 commits)
  Fixing issue where OSGi bundles weren't getting used for distribution.
  Fixes example in Type.asSeenFrom
  Fix for SI-6600, regression with ScalaNumber.
  SI-6562 Fix crash with class nested in @inline method
  Brings copyrights in Scaladoc footer and manpage up-to-date, from 2011/12 to 2013
  Brings all copyrights (in comments) up-to-date, from 2011/12 to 2013
  SI-6606 Drops new icons in, replaces abstract types placeholder icons
  SI-6132 Revisited, cleaned-up, links fixed, spelling errors fixed, rewordings
  Labeling scala.reflect and scala.reflect.macros experimental in the API docs
  Typo-fix in scala.concurrent.Future, thanks to @pavelpavlov
  Remove implementation details from Position (they are still under reflection.internal). It probably needs more cleanup of the api wrt to ranges etc but let's leave it for later
  SI-6399 Adds API docs for Any and AnyVal
  Removing actors-migration from main repository so it can live on elsewhere.
  Fix for SI-6597, implicit case class crasher.
  SI-6578 Harden against synthetics being added more than once.
  SI-6556 no assert for surprising ctor result type
  Removing actors-migration from main repository so it can live on elsewhere.
  Fixes SI-6500 by making erasure more regular.
  Modification to SI-6534 patch.
  Fixes SI-6559 - StringContext not using passed in escape function.
  ...

Conflicts:
	src/actors-migration/scala/actors/migration/StashingActor.scala
	src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
	src/compiler/scala/tools/nsc/settings/AestheticSettings.scala
	src/compiler/scala/tools/nsc/transform/Erasure.scala
	src/library/scala/Application.scala
	src/library/scala/collection/immutable/GenIterable.scala.disabled
	src/library/scala/collection/immutable/GenMap.scala.disabled
	src/library/scala/collection/immutable/GenSeq.scala.disabled
	src/library/scala/collection/immutable/GenSet.scala.disabled
	src/library/scala/collection/immutable/GenTraversable.scala.disabled
	src/library/scala/collection/mutable/GenIterable.scala.disabled
	src/library/scala/collection/mutable/GenMap.scala.disabled
	src/library/scala/collection/mutable/GenSeq.scala.disabled
	src/library/scala/collection/mutable/GenSet.scala.disabled
	src/library/scala/collection/mutable/GenTraversable.scala.disabled
	src/library/scala/collection/parallel/immutable/ParNumericRange.scala.disabled

1 files changed, 0 insertions, 95 deletions

diff --git a/test/files/jvm/actmig-instantiation.scala b/test/files/jvm/actmig-instantiation.scala
deleted file mode 100644
index 2e3ffc3c30..0000000000
--- a/test/files/jvm/actmig-instantiation.scala
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * NOTE: Code snippets from this test are included in the Actor Migration Guide. In case you change
- * code in these tests prior to the 2.10.0 release please send the notification to @vjovanov.
- */
-import scala.actors.migration._
-import scala.actors.Actor._
-import scala.actors._
-import java.util.concurrent.{ TimeUnit, CountDownLatch }
-import scala.collection.mutable.ArrayBuffer
-
-class TestStashingActor extends StashingActor {
-
-  def receive = { case v: Int => Test.append(v); Test.latch.countDown() }
-
-}
-
-object Test {
-  val NUMBER_OF_TESTS = 5
-
-  // used for sorting non-deterministic output
-  val buff = ArrayBuffer[Int](0)
-  val latch = new CountDownLatch(NUMBER_OF_TESTS)
-  val toStop = ArrayBuffer[ActorRef]()
-
-  def append(v: Int) = synchronized {
-    buff += v
-  }
-
-  def main(args: Array[String]) = {
-    // plain scala actor
-    val a1 = actor {
-      react { case v: Int => Test.append(v); Test.latch.countDown() }
-    }
-    a1 ! 100
-
-    // simple instantiation
-    val a2 = ActorDSL.actor(new TestStashingActor)
-    a2 ! 200
-    toStop += a2
-
-    // actor of with scala actor
-    val a3 = ActorDSL.actor(actor {
-      react { case v: Int => Test.append(v); Test.latch.countDown() }
-    })
-    a3 ! 300
-
-    // using the manifest
-    val a4 = ActorDSL.actor(new TestStashingActor)
-    a4 ! 400
-    toStop += a4
-
-    // deterministic part of a test
-    // creation without actor
-    try {
-      val a3 = new TestStashingActor
-      a3 ! -1
-    } catch {
-      case e: Throwable => println("OK error: " + e)
-    }
-
-    // actor double creation
-    try {
-      val a3 = ActorDSL.actor({
-        new TestStashingActor
-        new TestStashingActor
-      })
-      a3 ! -1
-    } catch {
-      case e: Throwable => println("OK error: " + e)
-    }
-
-    // actor nesting
-    try {
-      val a5 = ActorDSL.actor({
-        val a6 = ActorDSL.actor(new TestStashingActor)
-        toStop += a6
-        new TestStashingActor
-      })
-
-      a5 ! 500
-      toStop += a5
-    } catch {
-      case e: Throwable => println("Should not throw an exception: " + e)
-    }
-
-    // output
-    latch.await(5, TimeUnit.SECONDS)
-    if (latch.getCount() > 0) {
-      println("Error: Tasks have not finished!!!")
-    }
-
-    buff.sorted.foreach(println)
-    toStop.foreach(_ ! PoisonPill)
-  }
-}