Merge remote-tracking branch 'scala/2.10.x'

Conflicts:
	build.number
	src/reflect/scala/reflect/internal/Types.scala

2 files changed, 5 insertions, 31 deletions

diff --git a/test/files/pos/t4881.scala b/test/files/pos/t4881.scala
deleted file mode 100644
index 46cfad9793..0000000000
--- a/test/files/pos/t4881.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-class Contra[-T]
-trait A
-trait B extends A
-trait C extends B
-
-// test improved variance inference: first try formals to see in which variance positions the type param appears;
-// only when that fails to determine variance, look at result type
-object Test {
-  def contraLBUB[a >: C <: A](): Contra[a] = null
-  def contraLB[a >: C](): Contra[a] = null
-
-{
-  val x = contraLBUB() //inferred Contra[C] instead of Contra[A]
-  val x1: Contra[A] = x
-}
-
-{
-  val x = contraLB() //inferred Contra[C] instead of Contra[Any]
-  val x1: Contra[Any] = x
-}
-
-{
-  val x = contraLBUB // make sure it does the same thing as its ()-less counterpart
-  val x1: Contra[A] = x
-}
-
-{
-  val x = contraLB
-  val x1: Contra[Any] = x
-}
-}
diff --git a/test/files/pos/t6311.scala b/test/files/pos/t6311.scala
new file mode 100644
index 0000000000..d27ad2f502
--- /dev/null
+++ b/test/files/pos/t6311.scala
@@ -0,0 +1,5 @@
+class A {
+  def fooMinimal[T, Coll <: Traversable[T]](msg: String)(param1: Traversable[T])(param2: Coll): Traversable[T] = throw new Exception()
+
+  fooMinimal("")(List(1))(List(2))
+}