diff --git a/ChangeLog b/ChangeLog
index 67e5894193..984493af98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-17  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/playback/gstplaybasebin.c: (get_active_source):
+	  Make stream-switching appear instant to the application
+	  (ie. make sure that a g_object_get on 'current-foo' returns
+	  the stream previously set with g_object_set(). Totem needs
+	  this to update stream-related meta-info (like audio-codec)
+	  correctly when switching streams.
+
 2006-09-17  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_find_master_mixer),
@@ -80,6 +89,7 @@
 	Make queue_threshold variable big enough to store a uint64 time value.
 	API: playbin::queue-min-threshold property.
 
+>>>>>>> 1.2883
 2006-09-15  Wim Taymans  <wim@fluendo.com>
 
 	* configure.ac:
diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c
index 0c17920fe7..7b545a081d 100644
--- a/gst/playback/gstplaybasebin.c
+++ b/gst/playback/gstplaybasebin.c
@@ -1694,7 +1694,7 @@ get_active_source (GstPlayBaseBin * play_base_bin, GstStreamType type)
     GstStreamInfo *info = s->data;
 
     if (info->type == type) {
-      if (!info->mute) {
+      if (!info->mute && !g_object_get_data (G_OBJECT (info), "mute_probe")) {
         return num;
       } else {
         num++;