Merge branch 'master' into 0.11

Conflicts:
	common
	configure.ac

diff --cc configure.ac
index c8b8ea4,3c225d0..e5c5928
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -2,9 -2,10 +2,10 @@@ AC_PREREQ(2.60
  dnl initialize autoconf
  dnl when going to/from release please set the nano (fourth number) right !
  dnl releases only do Wall, cvs and prerelease does Werror too
 -AC_INIT(Gst-RTSP, 0.10.7.1,
 +AC_INIT(Gst-RTSP, 0.11.0.1,
-     http://gstreamer.net/,
+     http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
      gst-rtsp)
+ AG_GST_INIT
  
  dnl initialize automake
  AM_INIT_AUTOMAKE([-Wno-portability 1.10])

diff --cc gst/rtsp-server/rtsp-media.c
Simple merge