Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Sun, 16 Oct 2011 13:28:31 +0000 (15:28 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Sun, 16 Oct 2011 13:28:31 +0000 (15:28 +0200)
commit7f851794d62ea3651ad50587bbd402f5c1ea9929
tree91c0641818e2d599aabaf4b42851f920a640b75c
parent9712fe8a54927f69dc6a3ed7d6926ef4e8dc86a2
parent61a7e6bf38c01d555d01c44636b7f95176dc9482
Merge branch 'master' into 0.11
gst/camerabin/camerabinvideo.c