diff --git a/ChangeLog b/ChangeLog
index 8fa511f437..faec995ebe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-03-31  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/adder/gstadder.c: (gst_adder_get_type), (gst_adder_loop):
+          fix integer addition with help of Stefan Kost
+
+2004-03-31  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* po/nl.po: updated Dutch translation (Elros Cyriatan)
+
 2004-03-30  David Schleef  <ds@schleef.org>
 
 	* ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_alloc_buffer),
@@ -26,6 +35,7 @@
 	* ext/kio/kiosrc.cpp: (process_events):
 	  update handling event processing if inside KDE - untested
 
+>>>>>>> 1.489
 2004-03-29  David Schleef  <ds@schleef.org>
 
 	* ext/hermes/gsthermescolorspace.c: (plugin_init): decrease rank