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)
1  2 
gst/camerabin/camerabinvideo.c

Simple merge