Merge branch '2.10.x'

Patches applied:
 - rename of `dropRepeatedParamType` to `dropIllegalStarTypes` -- required since 8886d22cd6
 - fixed test/files/neg/t6406-regextract.flags -- how could this have worked before?

Conflicts:
	src/compiler/scala/tools/nsc/interpreter/TypeStrings.scala
	src/library/scala/collection/LinearSeqOptimized.scala
	src/library/scala/util/Properties.scala
	test/files/run/streams.check
	test/files/run/streams.scala

1 files changed, 24 insertions, 0 deletions

diff --git a/test/files/run/t6911.scala b/test/files/run/t6911.scala
new file mode 100644
index 0000000000..dd81257a96
--- /dev/null
+++ b/test/files/run/t6911.scala
@@ -0,0 +1,24 @@
+trait K {
+  case class CC(name: String)
+  case class DD[+A1, A2](x1: A1, x2: A2)
+}
+
+object Test {
+  object Foo extends K
+  object Bar extends K
+
+  val b1 = Foo.CC("b")
+  val b2 = Bar.CC("b")
+  val b3 = Foo.CC("b")
+
+  val c1 = Foo.DD("a", 5)
+  val c2 = Bar.DD("a", 5)
+  val c3 = Foo.DD("a", 5)
+
+  def main(args: Array[String]): Unit = {
+    assert(b1 != b2, ((b1, b2))) // false under 2.9, true under 2.10-RC5
+    assert(b1 == b3, ((b1, b3)))
+    assert(c1 != c2, ((c1, c2)))
+    assert(c1 == c3, ((c1, c3)))
+  }
+}