Merge branch 'master' of git+ssh://git.collabora.co.uk/git/gst-rtsp-server
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 4 Feb 2009 19:13:32 +0000 (20:13 +0100)
committerWim Taymans <wim@metal.(none)>
Wed, 4 Feb 2009 19:13:32 +0000 (20:13 +0100)

Trivial merge