diff --git a/ChangeLog b/ChangeLog
index 1ac79e11cb..8254aaf6dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-12  Sebastien Moutte  <sebastien@moutte.net>
+
+	* gst/dvdsub/gstdvdsubdec.c:(gst_dvd_sub_dec_parse_subpic):
+	Use gst_util_guint64_to_gdouble for conversion.
+	* win32/vs6/libgstasfdemux.dsp:
+	Add asfpacket.c to the build.
+	
 2007-06-08  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_reset),
diff --git a/common b/common
index b5971d76cc..6cb0000a5a 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit b5971d76ccd216c27e095c02c3a369a9d05cb36d
+Subproject commit 6cb0000a5a30d4fc580a06489106a637fca024c4
diff --git a/gst/dvdsub/gstdvdsubdec.c b/gst/dvdsub/gstdvdsubdec.c
index 26372542da..4cf35ef1e0 100644
--- a/gst/dvdsub/gstdvdsubdec.c
+++ b/gst/dvdsub/gstdvdsubdec.c
@@ -374,7 +374,7 @@ gst_dvd_sub_dec_parse_subpic (GstDvdSubDec * dec)
 
           GST_DEBUG_OBJECT (dec,
               "Next DCSQ at offset %d, delay %g secs (%d ticks)", buf - start,
-              (gdouble) event_time / GST_SECOND, ticks);
+              gst_util_guint64_to_gdouble (event_time / GST_SECOND), ticks);
 
           dec->parse_pos = buf;
           if (event_time > 0) {
diff --git a/win32/vs6/libgstasfdemux.dsp b/win32/vs6/libgstasfdemux.dsp
index b10698e9db..ee1d9f4e34 100644
--- a/win32/vs6/libgstasfdemux.dsp
+++ b/win32/vs6/libgstasfdemux.dsp
@@ -108,6 +108,10 @@ SOURCE=..\..\gst\asfdemux\asfheaders.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\gst\asfdemux\asfpacket.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\gst\asfdemux\gstasf.c
 # End Source File
 # Begin Source File