Merge commit '7ba38a0' into merge/2.11.x-to-2.12.x-20150129

Conflicts:
	build.number
	src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala
	src/library/scala/collection/Iterator.scala
	versions.properties

1 files changed, 0 insertions, 13 deletions

diff --git a/test/files/run/t3516.scala b/test/files/run/t3516.scala
deleted file mode 100644
index aa302ce85a..0000000000
--- a/test/files/run/t3516.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-object Test {
-  def mkIterator = (1 to 5).iterator map (x => { println(x) ; x })
-  def mkInfinite = Iterator continually { println(1) ; 1 }
-
-  def main(args: Array[String]): Unit = {
-    // Stream is strict in its head so we should see 1 from each of them.
-    val s1 = mkIterator.toStream
-    val s2 = mkInfinite.toStream
-    // back and forth without slipping into nontermination.
-    println((Stream from 1).toIterator.drop(10).toStream.drop(10).toIterator.next)
-    ()
-  }
-}