Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 13 Oct 2011 06:58:06 +0000 (08:58 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 13 Oct 2011 06:58:06 +0000 (08:58 +0200)
commita5cc912140b9f9f79cbdaa9335d0cb9d7f0baf5c
tree6b498db0612d374bd5ae6aa928d836d613ea03f3
parent36d069fe37efbe90c30c35891b879b9efa24e658
parent1b56d401703c16068c6e7dcb8245351556d37789
Merge branch 'master' into 0.11

Conflicts:
ext/jpeg/gstjpegdec.c
gst/rtp/gstrtpvrawpay.c
ext/jpeg/gstjpegdec.c
gst/rtp/gstrtpg722pay.c