Merge remote-tracking branch 'scala/2.10.x' into patmat-refactor-master

Conflicts:
	src/compiler/scala/tools/nsc/typechecker/Implicits.scala

2 files changed, 31 insertions, 0 deletions

diff --git a/test/files/pos/t6225.scala b/test/files/pos/t6225.scala
new file mode 100644
index 0000000000..d3d30d9e16
--- /dev/null
+++ b/test/files/pos/t6225.scala
@@ -0,0 +1,20 @@
+
+package library.x {
+  class X {
+    class Foo
+    implicit val foo: Foo = new Foo
+  }
+}
+package library {
+  package object y extends library.x.X
+}
+
+object ko {
+  import library.y.{Foo, foo}
+  implicitly[Foo]
+}
+
+object ko2 {
+  import library.y._
+  implicitly[Foo]
+}
diff --git a/test/files/pos/t6514.scala b/test/files/pos/t6514.scala
new file mode 100644
index 0000000000..7c58605d39
--- /dev/null
+++ b/test/files/pos/t6514.scala
@@ -0,0 +1,11 @@
+object Test {
+  def e(msg: String) = new Exception(msg)
+
+  // this code ain't dead.
+  def a(b: Boolean) = {
+    b match {
+      case true => throw e("true")
+      case false => throw e("false")
+    }
+  }
+}