Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 28 Feb 2011 10:58:05 +0000 (11:58 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 28 Feb 2011 10:58:05 +0000 (11:58 +0100)
commit759a3507d7d2a77cec6111dd34d6a67f2199dd59
tree194bff91aea009afe3f952b98c290e601fc8a1df
parent7aff7d5f786abff3591a15c84c95020bcaf0a1d4
parentcaa971e605a61e2d31a3927dcf22149125e580ad
Merge branch 'master' into 0.11

Conflicts:
configure.ac
configure.ac
gst/alpha/gstalpha.c
gst/rtsp/gstrtspsrc.c
sys/v4l2/gstv4l2object.c
sys/v4l2/gstv4l2xoverlay.c