diff --git a/ChangeLog b/ChangeLog
index 22938adafd..f8d9f5b022 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 21 16:25:25 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* common.mk, transcode_data_iso_8859.c: renamed to
+	  transcode_data_one_byte.c.
+
 Fri Dec 21 16:10:30 2007  Shigeo Kobayashi  <shigeo@tinyforest.jp>
 
 	* ext/bigdecimal/bigdecimal.c (VpMidRound): Round method bug
@@ -31,6 +36,7 @@ Fri Dec 21 15:31:59 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* encoding.c (rb_to_encoding): returns default encoding if no
 	  corresponding encoding found.
 
+>>>>>>> .r14414
 Fri Dec 21 15:24:22 2007  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (initialize): accept service name.  changed
@@ -67,6 +73,7 @@ Fri Dec 21 13:54:05 2007  Tanaka Akira  <akr@fsij.org>
 
 	* re.c: change "character encodings differ" error messages.
 
+>>>>>>> .r14409
 Fri Dec 21 13:46:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* encoding.c (rb_enc_register): set encoding constant.
diff --git a/common.mk b/common.mk
index 010044b621..5c9f83efe1 100644
--- a/common.mk
+++ b/common.mk
@@ -60,7 +60,7 @@ COMMONOBJS    = array.$(OBJEXT) \
 		struct.$(OBJEXT) \
 		time.$(OBJEXT) \
 		transcode.$(OBJEXT) \
-		transcode_data_iso_8859.$(OBJEXT) \
+		transcode_data_one_byte.$(OBJEXT) \
 		util.$(OBJEXT) \
 		variable.$(OBJEXT) \
 		version.$(OBJEXT) \
@@ -547,7 +547,7 @@ thread.$(OBJEXT): {$(VPATH)}thread.c {$(VPATH)}eval_intern.h \
   {$(VPATH)}signal.h {$(VPATH)}st.h {$(VPATH)}dln.h
 transcode.$(OBJEXT): {$(VPATH)}transcode.c {$(VPATH)}transcode_data.h {$(VPATH)}ruby.h {$(VPATH)}config.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h  {$(VPATH)}encoding.h
-transcode_data_iso_8859.$(OBJEXT): {$(VPATH)}transcode_data_iso_8859.c {$(VPATH)}transcode_data.h
+transcode_data_one_byte.$(OBJEXT): {$(VPATH)}transcode_data_one_byte.c {$(VPATH)}transcode_data.h
 cont.$(OBJEXT):  {$(VPATH)}cont.c {$(VPATH)}eval_intern.h \
   {$(VPATH)}ruby.h {$(VPATH)}vm_core.h {$(VPATH)}id.h {$(VPATH)}config.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
diff --git a/transcode_data_iso_8859.c b/transcode_data_one_byte.c
similarity index 100%
rename from transcode_data_iso_8859.c
rename to transcode_data_one_byte.c