54 files changed, 77 insertions, 77 deletions

diff --git a/src/library/scala/Function0.scala b/src/library/scala/Function0.scala
index 62fcd56975..3a90827e86 100644
--- a/src/library/scala/Function0.scala
+++ b/src/library/scala/Function0.scala
@@ -9,7 +9,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007 (with fancy comment)
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007 (with fancy comment)
 
 package scala
 
diff --git a/src/library/scala/Function1.scala b/src/library/scala/Function1.scala
index d1943ed37a..a5e6ae4e39 100644
--- a/src/library/scala/Function1.scala
+++ b/src/library/scala/Function1.scala
@@ -9,7 +9,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007 (with fancy comment) (with extra methods)
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007 (with fancy comment) (with extra methods)
 
 package scala
 
diff --git a/src/library/scala/Function2.scala b/src/library/scala/Function2.scala
index 577996c3d7..9cc16b40e3 100644
--- a/src/library/scala/Function2.scala
+++ b/src/library/scala/Function2.scala
@@ -9,7 +9,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007 (with fancy comment)
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007 (with fancy comment)
 
 package scala
 
diff --git a/src/library/scala/Function3.scala b/src/library/scala/Function3.scala
index 1e16994521..1de9e05409 100644
--- a/src/library/scala/Function3.scala
+++ b/src/library/scala/Function3.scala
@@ -9,7 +9,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Function4.scala b/src/library/scala/Function4.scala
index 64181ce495..3b584b4012 100644
--- a/src/library/scala/Function4.scala
+++ b/src/library/scala/Function4.scala
@@ -9,7 +9,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Function5.scala b/src/library/scala/Function5.scala
index 351d0e41f7..6c93fa69b3 100644
--- a/src/library/scala/Function5.scala
+++ b/src/library/scala/Function5.scala
@@ -9,7 +9,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Function6.scala b/src/library/scala/Function6.scala
index 20942acb21..e6824e94ce 100644
--- a/src/library/scala/Function6.scala
+++ b/src/library/scala/Function6.scala
@@ -9,7 +9,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Function7.scala b/src/library/scala/Function7.scala
index 9e5d049e3d..2c8ae91a47 100644
--- a/src/library/scala/Function7.scala
+++ b/src/library/scala/Function7.scala
@@ -9,7 +9,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Function8.scala b/src/library/scala/Function8.scala
index 2f4cd77d20..6eea9697fa 100644
--- a/src/library/scala/Function8.scala
+++ b/src/library/scala/Function8.scala
@@ -9,7 +9,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Product0.scala b/src/library/scala/Product0.scala
index e3b1c3c07f..f6cbcb5f46 100644
--- a/src/library/scala/Product0.scala
+++ b/src/library/scala/Product0.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product0 {
-  def unapply(x: Product0): Some[Product0] =
+  def unapply(x: Product0): Option[Product0] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product1.scala b/src/library/scala/Product1.scala
index 62382949ae..3428ddeb64 100644
--- a/src/library/scala/Product1.scala
+++ b/src/library/scala/Product1.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product1 {
-  def unapply[T1](x: Product1[T1]): Some[Product1[T1]] =
+  def unapply[T1](x: Product1[T1]): Option[Product1[T1]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product10.scala b/src/library/scala/Product10.scala
index ce24d6a4f9..bc88a68787 100644
--- a/src/library/scala/Product10.scala
+++ b/src/library/scala/Product10.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product10 {
-  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10](x: Product10[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]): Some[Product10[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]] =
+  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10](x: Product10[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]): Option[Product10[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product11.scala b/src/library/scala/Product11.scala
index 2156c0d385..96c54faad7 100644
--- a/src/library/scala/Product11.scala
+++ b/src/library/scala/Product11.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product11 {
-  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11](x: Product11[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11]): Some[Product11[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11]] =
+  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11](x: Product11[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11]): Option[Product11[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product12.scala b/src/library/scala/Product12.scala
index 4b90ab2a1a..47b878054d 100644
--- a/src/library/scala/Product12.scala
+++ b/src/library/scala/Product12.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product12 {
-  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12](x: Product12[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12]): Some[Product12[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12]] =
+  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12](x: Product12[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12]): Option[Product12[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product13.scala b/src/library/scala/Product13.scala
index 4bbb9c58b1..d464d415c8 100644
--- a/src/library/scala/Product13.scala
+++ b/src/library/scala/Product13.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product13 {
-  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13](x: Product13[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13]): Some[Product13[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13]] =
+  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13](x: Product13[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13]): Option[Product13[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product14.scala b/src/library/scala/Product14.scala
index 464f991cbe..e166d43112 100644
--- a/src/library/scala/Product14.scala
+++ b/src/library/scala/Product14.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product14 {
-  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14](x: Product14[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14]): Some[Product14[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14]] =
+  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14](x: Product14[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14]): Option[Product14[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product15.scala b/src/library/scala/Product15.scala
index 7cda2e90dc..c35384f84c 100644
--- a/src/library/scala/Product15.scala
+++ b/src/library/scala/Product15.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product15 {
-  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15](x: Product15[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15]): Some[Product15[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15]] =
+  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15](x: Product15[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15]): Option[Product15[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product16.scala b/src/library/scala/Product16.scala
index 4d9a597cf2..4700963e80 100644
--- a/src/library/scala/Product16.scala
+++ b/src/library/scala/Product16.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product16 {
-  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16](x: Product16[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16]): Some[Product16[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16]] =
+  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16](x: Product16[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16]): Option[Product16[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product17.scala b/src/library/scala/Product17.scala
index fe36e75b49..e7c8da4503 100644
--- a/src/library/scala/Product17.scala
+++ b/src/library/scala/Product17.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product17 {
-  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17](x: Product17[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17]): Some[Product17[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17]] =
+  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17](x: Product17[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17]): Option[Product17[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product18.scala b/src/library/scala/Product18.scala
index ff01649fda..be9ae51d65 100644
--- a/src/library/scala/Product18.scala
+++ b/src/library/scala/Product18.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product18 {
-  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18](x: Product18[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18]): Some[Product18[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18]] =
+  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18](x: Product18[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18]): Option[Product18[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product19.scala b/src/library/scala/Product19.scala
index ec04d99c13..174810d9e7 100644
--- a/src/library/scala/Product19.scala
+++ b/src/library/scala/Product19.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product19 {
-  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19](x: Product19[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19]): Some[Product19[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19]] =
+  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19](x: Product19[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19]): Option[Product19[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product2.scala b/src/library/scala/Product2.scala
index c0b5073ed1..e28e9719d5 100644
--- a/src/library/scala/Product2.scala
+++ b/src/library/scala/Product2.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product2 {
-  def unapply[T1, T2](x: Product2[T1, T2]): Some[Product2[T1, T2]] =
+  def unapply[T1, T2](x: Product2[T1, T2]): Option[Product2[T1, T2]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product20.scala b/src/library/scala/Product20.scala
index 24ddda339b..41b6e3ae84 100644
--- a/src/library/scala/Product20.scala
+++ b/src/library/scala/Product20.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product20 {
-  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20](x: Product20[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20]): Some[Product20[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20]] =
+  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20](x: Product20[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20]): Option[Product20[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product21.scala b/src/library/scala/Product21.scala
index 81458cbc8c..ea4b34e705 100644
--- a/src/library/scala/Product21.scala
+++ b/src/library/scala/Product21.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product21 {
-  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21](x: Product21[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21]): Some[Product21[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21]] =
+  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21](x: Product21[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21]): Option[Product21[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product22.scala b/src/library/scala/Product22.scala
index c032474a70..3f402f33fb 100644
--- a/src/library/scala/Product22.scala
+++ b/src/library/scala/Product22.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product22 {
-  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22](x: Product22[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22]): Some[Product22[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22]] =
+  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22](x: Product22[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22]): Option[Product22[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product3.scala b/src/library/scala/Product3.scala
index 48b4bc143d..5837012187 100644
--- a/src/library/scala/Product3.scala
+++ b/src/library/scala/Product3.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product3 {
-  def unapply[T1, T2, T3](x: Product3[T1, T2, T3]): Some[Product3[T1, T2, T3]] =
+  def unapply[T1, T2, T3](x: Product3[T1, T2, T3]): Option[Product3[T1, T2, T3]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product4.scala b/src/library/scala/Product4.scala
index 5390a0a6dc..a94602a076 100644
--- a/src/library/scala/Product4.scala
+++ b/src/library/scala/Product4.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product4 {
-  def unapply[T1, T2, T3, T4](x: Product4[T1, T2, T3, T4]): Some[Product4[T1, T2, T3, T4]] =
+  def unapply[T1, T2, T3, T4](x: Product4[T1, T2, T3, T4]): Option[Product4[T1, T2, T3, T4]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product5.scala b/src/library/scala/Product5.scala
index 33fb25436b..e776a6dd25 100644
--- a/src/library/scala/Product5.scala
+++ b/src/library/scala/Product5.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product5 {
-  def unapply[T1, T2, T3, T4, T5](x: Product5[T1, T2, T3, T4, T5]): Some[Product5[T1, T2, T3, T4, T5]] =
+  def unapply[T1, T2, T3, T4, T5](x: Product5[T1, T2, T3, T4, T5]): Option[Product5[T1, T2, T3, T4, T5]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product6.scala b/src/library/scala/Product6.scala
index e9ca993dcb..c166c3d6eb 100644
--- a/src/library/scala/Product6.scala
+++ b/src/library/scala/Product6.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product6 {
-  def unapply[T1, T2, T3, T4, T5, T6](x: Product6[T1, T2, T3, T4, T5, T6]): Some[Product6[T1, T2, T3, T4, T5, T6]] =
+  def unapply[T1, T2, T3, T4, T5, T6](x: Product6[T1, T2, T3, T4, T5, T6]): Option[Product6[T1, T2, T3, T4, T5, T6]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product7.scala b/src/library/scala/Product7.scala
index 7f556387c4..15366ce0d6 100644
--- a/src/library/scala/Product7.scala
+++ b/src/library/scala/Product7.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product7 {
-  def unapply[T1, T2, T3, T4, T5, T6, T7](x: Product7[T1, T2, T3, T4, T5, T6, T7]): Some[Product7[T1, T2, T3, T4, T5, T6, T7]] =
+  def unapply[T1, T2, T3, T4, T5, T6, T7](x: Product7[T1, T2, T3, T4, T5, T6, T7]): Option[Product7[T1, T2, T3, T4, T5, T6, T7]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product8.scala b/src/library/scala/Product8.scala
index 64eccd6cf3..995a7509b2 100644
--- a/src/library/scala/Product8.scala
+++ b/src/library/scala/Product8.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product8 {
-  def unapply[T1, T2, T3, T4, T5, T6, T7, T8](x: Product8[T1, T2, T3, T4, T5, T6, T7, T8]): Some[Product8[T1, T2, T3, T4, T5, T6, T7, T8]] =
+  def unapply[T1, T2, T3, T4, T5, T6, T7, T8](x: Product8[T1, T2, T3, T4, T5, T6, T7, T8]): Option[Product8[T1, T2, T3, T4, T5, T6, T7, T8]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Product9.scala b/src/library/scala/Product9.scala
index a5721d12e7..466757c137 100644
--- a/src/library/scala/Product9.scala
+++ b/src/library/scala/Product9.scala
@@ -9,14 +9,14 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
 import Predef._
 
 object Product9 {
-  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9](x: Product9[T1, T2, T3, T4, T5, T6, T7, T8, T9]): Some[Product9[T1, T2, T3, T4, T5, T6, T7, T8, T9]] =
+  def unapply[T1, T2, T3, T4, T5, T6, T7, T8, T9](x: Product9[T1, T2, T3, T4, T5, T6, T7, T8, T9]): Option[Product9[T1, T2, T3, T4, T5, T6, T7, T8, T9]] =
     Some(x)
 }
 
diff --git a/src/library/scala/Tuple1.scala b/src/library/scala/Tuple1.scala
index b715cc74a2..44d6bee2b3 100644
--- a/src/library/scala/Tuple1.scala
+++ b/src/library/scala/Tuple1.scala
@@ -9,7 +9,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple10.scala b/src/library/scala/Tuple10.scala
index cc85c91b7c..3a2f8b05e5 100644
--- a/src/library/scala/Tuple10.scala
+++ b/src/library/scala/Tuple10.scala
@@ -9,7 +9,7 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple11.scala b/src/library/scala/Tuple11.scala
index 7e64ab9286..7c95ceeb1d 100644
--- a/src/library/scala/Tuple11.scala
+++ b/src/library/scala/Tuple11.scala
@@ -9,7 +9,7 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple12.scala b/src/library/scala/Tuple12.scala
index 4b33d460f6..71cc28d718 100644
--- a/src/library/scala/Tuple12.scala
+++ b/src/library/scala/Tuple12.scala
@@ -9,7 +9,7 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple13.scala b/src/library/scala/Tuple13.scala
index e3ad293334..74a129c1b9 100644
--- a/src/library/scala/Tuple13.scala
+++ b/src/library/scala/Tuple13.scala
@@ -9,7 +9,7 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple14.scala b/src/library/scala/Tuple14.scala
index f1a45c0461..36c657f461 100644
--- a/src/library/scala/Tuple14.scala
+++ b/src/library/scala/Tuple14.scala
@@ -9,7 +9,7 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple15.scala b/src/library/scala/Tuple15.scala
index b25c5e732d..5602936487 100644
--- a/src/library/scala/Tuple15.scala
+++ b/src/library/scala/Tuple15.scala
@@ -9,7 +9,7 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple16.scala b/src/library/scala/Tuple16.scala
index e7241d8b8c..1e96b5e5f7 100644
--- a/src/library/scala/Tuple16.scala
+++ b/src/library/scala/Tuple16.scala
@@ -9,7 +9,7 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple17.scala b/src/library/scala/Tuple17.scala
index 19d984e1bd..727d00c321 100644
--- a/src/library/scala/Tuple17.scala
+++ b/src/library/scala/Tuple17.scala
@@ -9,7 +9,7 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple18.scala b/src/library/scala/Tuple18.scala
index 0c8a2f56e1..600ce2faf7 100644
--- a/src/library/scala/Tuple18.scala
+++ b/src/library/scala/Tuple18.scala
@@ -9,7 +9,7 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple19.scala b/src/library/scala/Tuple19.scala
index 64500818b1..9adfd51149 100644
--- a/src/library/scala/Tuple19.scala
+++ b/src/library/scala/Tuple19.scala
@@ -9,7 +9,7 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple2.scala b/src/library/scala/Tuple2.scala
index e1214501e1..1b1b2d2973 100644
--- a/src/library/scala/Tuple2.scala
+++ b/src/library/scala/Tuple2.scala
@@ -9,7 +9,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple20.scala b/src/library/scala/Tuple20.scala
index 6d38baf11d..df427cb6b4 100644
--- a/src/library/scala/Tuple20.scala
+++ b/src/library/scala/Tuple20.scala
@@ -9,7 +9,7 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple21.scala b/src/library/scala/Tuple21.scala
index 66275f4217..17c917d80b 100644
--- a/src/library/scala/Tuple21.scala
+++ b/src/library/scala/Tuple21.scala
@@ -9,7 +9,7 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple22.scala b/src/library/scala/Tuple22.scala
index 9cf32a3351..557521865f 100644
--- a/src/library/scala/Tuple22.scala
+++ b/src/library/scala/Tuple22.scala
@@ -9,7 +9,7 @@
 
 // $Id: genprod.scala 9543 2007-01-02 16:51:29Z emir $
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple3.scala b/src/library/scala/Tuple3.scala
index b6a877c118..73ac4542aa 100644
--- a/src/library/scala/Tuple3.scala
+++ b/src/library/scala/Tuple3.scala
@@ -9,7 +9,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple4.scala b/src/library/scala/Tuple4.scala
index b25be554fd..21d2ff5682 100644
--- a/src/library/scala/Tuple4.scala
+++ b/src/library/scala/Tuple4.scala
@@ -9,7 +9,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple5.scala b/src/library/scala/Tuple5.scala
index 30591eda6d..bda3f71547 100644
--- a/src/library/scala/Tuple5.scala
+++ b/src/library/scala/Tuple5.scala
@@ -9,7 +9,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple6.scala b/src/library/scala/Tuple6.scala
index 3b23ef9d52..5b69c5303a 100644
--- a/src/library/scala/Tuple6.scala
+++ b/src/library/scala/Tuple6.scala
@@ -9,7 +9,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple7.scala b/src/library/scala/Tuple7.scala
index a3d7249687..79c98aec53 100644
--- a/src/library/scala/Tuple7.scala
+++ b/src/library/scala/Tuple7.scala
@@ -9,7 +9,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple8.scala b/src/library/scala/Tuple8.scala
index b761e25a54..377a3a251b 100644
--- a/src/library/scala/Tuple8.scala
+++ b/src/library/scala/Tuple8.scala
@@ -9,7 +9,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala
 
diff --git a/src/library/scala/Tuple9.scala b/src/library/scala/Tuple9.scala
index ec191e9181..8bbd506736 100644
--- a/src/library/scala/Tuple9.scala
+++ b/src/library/scala/Tuple9.scala
@@ -9,7 +9,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Jan 03 13:31:53 CET 2007
+// generated by genprod on Wed Jan 03 13:46:54 CET 2007
 
 package scala