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

# By Ruediger Klaehn (14) and others
# Via Josh Suereth (13) and others
* origin/2.10.x: (49 commits)
  More useful -Xlog-implicits output.
  Reflection tuning
  Two more value classes.
  Fixed cloning a double-linked list.
  Expanded the reach of value classes.
  Added/fixed test files for SI-6227
  Two fixes for the worksheet instrumenter
  Fix crasher from bug in maven ant tasks.  Yippie.
  Closes SI-6227
  Fix for SI-6283, no abstract value classes.
  hotfix for SI-6293
  Commented out assertions
  removes Symbol.kind and Type.kind
  Add missing tests for SI-6190
  SI-6281 macroArgs for defs with implicit args
  SI-6280 Scaladoc: Reloading preserves anchors
  Added test to ensure that ListMap.tail is O(1)
  Made ListMap.tail O(1) instead of O(N)
  SI-6052 - fix groupBy on parallel collections
  SI-6272 Support lazy vals defined in try in template.
  ...

2 files changed, 17 insertions, 2 deletions

diff --git a/test/files/pos/javaConversions-2.10-regression.scala b/test/files/pos/javaConversions-2.10-regression.scala
new file mode 100644
index 0000000000..e1b81015ba
--- /dev/null
+++ b/test/files/pos/javaConversions-2.10-regression.scala
@@ -0,0 +1,17 @@
+import collection.{JavaConversions, mutable, concurrent}
+import JavaConversions._
+import java.util.concurrent.{ConcurrentHashMap => CHM}
+
+object Foo {
+  def buildCache2_9_simple[K <: AnyRef, V <: AnyRef]: mutable.ConcurrentMap[K, V] =
+    asScalaConcurrentMap(new CHM())
+
+  def buildCache2_9_implicit[K <: AnyRef, V <: AnyRef]: mutable.ConcurrentMap[K, V] =
+    new CHM[K, V]()
+}
+
+object Bar {
+  def assertType[T](t: T) = t
+  val a = new CHM[String, String]() += (("", ""))
+  assertType[concurrent.Map[String, String]](a)
+}
diff --git a/test/files/pos/t5667.scala b/test/files/pos/t5667.scala
index 513de5b663..353eec93d6 100644
--- a/test/files/pos/t5667.scala
+++ b/test/files/pos/t5667.scala
@@ -1,6 +1,4 @@
 object Main {
   implicit class C(val s: String) extends AnyVal
   implicit class C2(val s: String) extends AnyRef
-
-  implicit case class Foo(i: Int)
 }