diff --git a/ChangeLog b/ChangeLog
index 5b0370de1d..53ec9891d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jan  8 04:38:47 2005  why the lucky stiff  <why@ruby-lang.org>
+
+	* lib/yaml.rb: Kernel#y requires an argument.
+
 Fri Jan  7 21:12:29 2005  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
 
 	* random.c (rand_init): use ALLOC_N instead of ALLOCA_N
@@ -253,6 +257,7 @@ Fri Dec 24 02:22:53 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/syck/rubyext.c (syck_emitter_s_alloc, syck_emitter_initialize):
 	  ditto.
 
+>>>>>>> 1.2673.2.773
 Fri Dec 24 01:21:00 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/blt.rb: add BLT extension support
diff --git a/lib/yaml.rb b/lib/yaml.rb
index 38463404bd..6837cc239d 100644
--- a/lib/yaml.rb
+++ b/lib/yaml.rb
@@ -400,7 +400,8 @@ module Kernel
     # ryan:: Either way, I certainly will have a pony parade.
     #
 
-    def y( *x )
+    def y( o, *x )
+        x.unshift o
         puts( if x.length == 1
                   YAML::dump( *x )
               else