Merge branch 'master' into 0.11
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Mon, 5 Mar 2012 12:29:59 +0000 (13:29 +0100)
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Mon, 5 Mar 2012 12:29:59 +0000 (13:29 +0100)
commit26dd999b68a50d51c4c18817b472832fb5f07228
treef1ceff3b8289f13f4dba6f86986d5f36fe11e233
parent2adc948d186a1162b111519ae3cee741c9602629
parenta83d2f70473d161dbb6c9ceff21dc214ec9db3a8
Merge branch 'master' into 0.11

Conflicts:
ext/wavpack/gstwavpackparse.c
sys/v4l2/gstv4l2bufferpool.c
sys/v4l2/gstv4l2bufferpool.h
sys/v4l2/gstv4l2videooverlay.c
ext/jack/gstjack.h
ext/jack/gstjackaudioclient.c
ext/jack/gstjackaudiosink.c
ext/jack/gstjackaudiosink.h
ext/jack/gstjackaudiosrc.c
ext/jack/gstjackaudiosrc.h
ext/wavpack/gstwavpackdec.c
ext/wavpack/gstwavpackenc.c
ext/wavpack/gstwavpackparse.c
gst/avi/gstavimux.c
sys/v4l2/gstv4l2videooverlay.c