diff --git a/ChangeLog b/ChangeLog
index adec768b34..2def2b1518 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-24  Benjamin Otte  <in7y118@public.uni-hamburg.de>
+
+	* gst-libs/gst/resample/private.h:
+	  don't use optimizations that are #if 0'ed
+
 2004-05-24  Wim Taymans  <wim@fluendo.com>
 
 	* gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query):
diff --git a/common b/common
index 85747ad7d1..6e6d3f154c 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 85747ad7d18dfc697845a457631f3877fda46906
+Subproject commit 6e6d3f154c84195e9d505e114ea4a2df216f7277