Merged lazy values branch to trunk.

1 files changed, 2 insertions, 2 deletions

diff --git a/test/files/run/bug603.scala b/test/files/run/bug603.scala
index c1e0aace12..361cef1f41 100644
--- a/test/files/run/bug603.scala
+++ b/test/files/run/bug603.scala
@@ -1,4 +1,4 @@
-object lazy {
+object forceDelay {
   class Susp[+A](lazyValue: => A) extends Function0[A] {
     private var func: () => Any = () => lazyValue
     private var value: Any = null
@@ -21,7 +21,7 @@ object lazy {
 }
 
 object Test {
-  import lazy._
+  import forceDelay._
 
   def main(args: Array[String]) = {
     val s: Susp[Int] = delay { Console.println("evaluating..."); 3 }