Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 29 Aug 2011 11:43:59 +0000 (13:43 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 29 Aug 2011 11:43:59 +0000 (13:43 +0200)
commit5b55cf057bb16d05e3d228ca37c08bc81b69add3
tree53d6e6973e477c2f82cdc925eadac665068680c5
parent75e153bb13fc3292a521c87e4f8ca25b2342beb9
parent3968dc7688021cdf1d1c52e6d7838668bdccb2e1
Merge branch 'master' into 0.11

Conflicts:
sys/v4l2/v4l2src_calls.c
sys/v4l2/gstv4l2object.c