Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Sat, 8 Oct 2011 09:17:11 +0000 (11:17 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Sat, 8 Oct 2011 09:17:11 +0000 (11:17 +0200)
commitc16cc4698a16ca3fda698fef0739550f7eb26ebb
treeee7b0794cb2a52ddc3d694559c466939ec406de4
parent3267a38e37c8bdbdd6356897f2fa3ecf525206ed
parent2c4bc6134c554d08f39af7520262084199462b39
Merge branch 'master' into 0.11
tests/examples/camerabin/gst-camera.c