diff --git a/ChangeLog b/ChangeLog
index 70e41646d9..86751f0325 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-09-21  Stefan Kost  <ensonic@users.sf.net>
+
+	* gst-libs/gst/interfaces/videoorientation.c:
+	(gst_video_orientation_iface_init),
+	(gst_video_orientation_get_hflip),
+	(gst_video_orientation_get_vflip),
+	(gst_video_orientation_get_hcenter),
+	(gst_video_orientation_get_vcenter),
+	(gst_video_orientation_set_hflip),
+	(gst_video_orientation_set_vflip),
+	(gst_video_orientation_set_hcenter),
+	(gst_video_orientation_set_vcenter):
+	  Add since tags to new API docs, ChangeLog surgery (forgot API keyword
+	  in ChangeLog)
+
 2006-09-21  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* tests/check/Makefile.am:
@@ -44,6 +59,14 @@
 	* tests/check/pipelines/oggmux.c: (eos_buffer_probe):
 	Fix some warnings.
 
+2006-09-20  Stefan Kost  <ensonic@users.sf.net>
+
+	* sys/xvimage/xvimagesink.c: (gst_xvimage_buffer_destroy),
+	(gst_xvimagesink_check_xshm_calls), (gst_xvimagesink_xvimage_new),
+	(gst_xvimagesink_get_xv_support), (gst_xvimagesink_show_frame):
+	  Handcrafted merge to help CVS understanding what I changed and what
+	  not.
+
 2006-09-20  Stefan Kost  <ensonic@users.sf.net>
 
 	* sys/xvimage/xvimagesink.c: (gst_xvimagesink_get_xv_support),
@@ -76,7 +99,7 @@
 	(gst_xvimagesink_get_xv_support), (gst_xvimagesink_show_frame):
 	Small cleanups, move error handling out of normal flow for clarity.
 
-2006-09-18  Stefan Kost,,,  <ensonic@users.sf.net>
+2006-09-18  Stefan Kost  <ensonic@users.sf.net>
 
 	* docs/libs/gst-plugins-base-libs-docs.sgml:
 	* docs/libs/gst-plugins-base-libs.types:
@@ -93,7 +116,7 @@
 	(gst_video_orientation_set_hcenter),
 	(gst_video_orientation_set_vcenter):
 	* gst-libs/gst/interfaces/videoorientation.h:
-	  Add new interface to control video orientation (fixes #354908)
+	  API: Add new interface to control video orientation (fixes #354908)
 
 2006-09-18  Stefan Kost  <ensonic@users.sf.net>
 
diff --git a/gst-libs/gst/interfaces/videoorientation.c b/gst-libs/gst/interfaces/videoorientation.c
index 778d17cad7..35ded695a0 100644
--- a/gst-libs/gst/interfaces/videoorientation.c
+++ b/gst-libs/gst/interfaces/videoorientation.c
@@ -35,6 +35,8 @@
  *
  * The interface allows unified access to control flipping and autocenter
  * operation of video-sources or operators.
+ *
+ * Since: 0.10.11
  */
 
 static void gst_video_orientation_iface_init (GstVideoOrientationInterface *
@@ -90,6 +92,7 @@ gst_video_orientation_iface_init (GstVideoOrientationInterface * iface)
  *
  * Get the horizontal flipping state (%TRUE for flipped) from the given object.
  *
+ * Since: 0.10.11
  * Returns: %TRUE in case the element supports flipping
  */
 gboolean
@@ -112,6 +115,7 @@ gst_video_orientation_get_hflip (GstVideoOrientation * video_orientation,
  *
  * Get the vertical flipping state (%TRUE for flipped) from the given object.
  *
+ * Since: 0.10.11
  * Returns: %TRUE in case the element supports flipping
  */
 gboolean
@@ -134,6 +138,7 @@ gst_video_orientation_get_vflip (GstVideoOrientation * video_orientation,
  *
  * Get the horizontal centering offset from the given object.
  *
+ * Since: 0.10.11
  * Returns: %TRUE in case the element supports centering
  */
 gboolean
@@ -156,6 +161,7 @@ gst_video_orientation_get_hcenter (GstVideoOrientation * video_orientation,
  *
  * Get the vertical centering offset from the given object.
  *
+ * Since: 0.10.11
  * Returns: %TRUE in case the element supports centering
  */
 gboolean
@@ -178,6 +184,7 @@ gst_video_orientation_get_vcenter (GstVideoOrientation * video_orientation,
  *
  * Set the horizontal flipping state (%TRUE for flipped) for the given object.
  *
+ * Since: 0.10.11
  * Returns: %TRUE in case the element supports flipping
  */
 gboolean
@@ -200,6 +207,7 @@ gst_video_orientation_set_hflip (GstVideoOrientation * video_orientation,
  *
  * Set the vertical flipping state (%TRUE for flipped) for the given object.
  *
+ * Since: 0.10.11
  * Returns: %TRUE in case the element supports flipping
  */
 gboolean
@@ -222,6 +230,7 @@ gst_video_orientation_set_vflip (GstVideoOrientation * video_orientation,
  *
  * Set the horizontal centering offset for the given object.
  *
+ * Since: 0.10.11
  * Returns: %TRUE in case the element supports centering
  */
 gboolean
@@ -244,6 +253,7 @@ gst_video_orientation_set_hcenter (GstVideoOrientation * video_orientation,
  *
  * Set the vertical centering offset for the given object.
  *
+ * Since: 0.10.11
  * Returns: %TRUE in case the element supports centering
  */
 gboolean