Merge remote-tracking branch 'origin/2.10.x' into merge-210

* origin/2.10.x: (68 commits)
  Eliminate breaking relative names in source.
  "Hot fix" for broken build.
  Fix SI-4813 - Clone doesn't work on LinkedList.
  Made 'def clone()' consistent with parens everywhere.
  accommodates pull request feedback
  SI-6310 redeploys the starr
  SI-6310 AbsTypeTag => WeakTypeTag
  SI-6323 outlaws free types from TypeTag
  SI-6323 prohibits reflection against free types
  improvements for reification of free symbols
  removes build.newFreeExistential
  SI-6359 Deep prohibition of templates in value class
  Fixes SI-6259.  Unable to use typeOf in super call of top-level object.
  Fixes binary repo push for new typesafe repo layouts.
  Better error message for pattern arity errors.
  Rescued TreeBuilder from the parser.
  Pending test for SI-3943
  Test case for a bug fixed in M7.
  Fix for SI-6367, exponential time in inference.
  SI-6306 Remove incorrect eta-expansion optimization in Uncurry
  ...

Conflicts:
	src/compiler/scala/tools/nsc/transform/AddInterfaces.scala
	src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala

1 files changed, 2 insertions, 2 deletions

diff --git a/src/library/scala/collection/immutable/List.scala b/src/library/scala/collection/immutable/List.scala
index 5e32dd86c9..d3402e16a2 100644
--- a/src/library/scala/collection/immutable/List.scala
+++ b/src/library/scala/collection/immutable/List.scala
@@ -13,7 +13,7 @@ package immutable
 
 import generic._
 import mutable.{Builder, ListBuffer}
-import annotation.tailrec
+import scala.annotation.tailrec
 import java.io._
 
 /** A class for immutable linked lists representing ordered collections
@@ -331,7 +331,7 @@ case object Nil extends List[Nothing] {
     throw new UnsupportedOperationException("tail of empty list")
   // Removal of equals method here might lead to an infinite recursion similar to IntMap.equals.
   override def equals(that: Any) = that match {
-    case that1: collection.GenSeq[_] => that1.isEmpty
+    case that1: scala.collection.GenSeq[_] => that1.isEmpty
     case _ => false
   }
 }