Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 8 Dec 2011 01:28:26 +0000 (01:28 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 8 Dec 2011 01:28:26 +0000 (01:28 +0000)
commit668e15598b6a3f3298505546124818e191e78943
tree9a90d1937ef073b550cdd9a30dd4dc53c3306128
parentb1d771cf8c63faae248afd1de9735796b77b20b0
parent687d6138d1416602d45041c0ca4a3502a712ffb7
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
sys/v4l2/gstv4l2object.c
docs/plugins/gst-plugins-good-plugins-sections.txt
gst/audioparsers/gstflacparse.c
gst/flv/gstflvdemux.c
gst/matroska/matroska-parse.c
gst/rtp/gstrtpjpegpay.c
sys/v4l2/gstv4l2object.c