Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 17 Feb 2012 08:01:56 +0000 (09:01 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 17 Feb 2012 08:01:56 +0000 (09:01 +0100)
commitf08e247051c5c6d0aaacc29f99a2b0bb9de8405e
treebccf72b7de9d5db683864ac1948a0f50c6303c2b
parent2fca270f1956fa3379ebca02203e3f95ae8aba42
parent39bad1d6ca2600eb9d2ad46e3842b8a564cf6c43
Merge branch 'master' into 0.11
gst/camerabin2/gstwrappercamerabinsrc.c