Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 4 Nov 2011 10:01:01 +0000 (11:01 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 4 Nov 2011 10:01:01 +0000 (11:01 +0100)
commit2b29d9852c97f50bfdff55bcfe61d888fe2d5aaa
tree6148f35d0afff0f12a80b05b38b1bf7b661bbe46
parent1e727429a8b8afae868c362a21f1727f4a1630b6
parentd65490dfad2610b203a4968ed6857d91bee60141
Merge branch 'master' into 0.11

Conflicts:
gst/rtp/gstrtpvrawdepay.c