Merge branch 'master' into execution-context

Conflicts:
	src/library/scala/package.scala

1 files changed, 14 insertions, 0 deletions

diff --git a/test/pending/pos/t5259.scala b/test/pending/pos/t5259.scala
new file mode 100644
index 0000000000..317e28a9dc
--- /dev/null
+++ b/test/pending/pos/t5259.scala
@@ -0,0 +1,14 @@
+object DefaultArgBogusTypeMismatch {
+
+  class A[T]
+  class B {
+    type T = this.type
+    def m(implicit a : A[T] = new A[T]) = a
+  }
+  
+  def newB = new B
+  val a1 = newB.m       // Bogus type mismatch
+
+  val stableB = new B
+  val a2 = stableB.m    // OK
+}