Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 7 Apr 2011 14:19:08 +0000 (16:19 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 7 Apr 2011 14:19:08 +0000 (16:19 +0200)
commit3ea2bc3ab0427558682fa91f2abac907d9d7b53b
tree4128c4fcd479d34a31e4290b4ca4a4a5e42037e1
parentc8fee4a4b35a526319d9a0e67728cdaf8a51e8a8
parent96463bb8df2711994b42f92465f909b1d13217f3
Merge branch 'master' into 0.11

Conflicts:
gst-libs/gst/rtp/gstbasertpdepayload.c
gst-libs/gst/rtp/gstbasertpdepayload.c
gst-libs/gst/rtp/gstrtpbuffer.c