Merge remote-tracking branch 'origin/master' into 0.11
authorEdward Hervey <edward.hervey@collabora.co.uk>
Fri, 30 Dec 2011 10:49:27 +0000 (11:49 +0100)
committerEdward Hervey <edward.hervey@collabora.co.uk>
Fri, 30 Dec 2011 10:49:27 +0000 (11:49 +0100)
commit4917e16458a7e59797e43ace5373a10c5bcc6925
tree3bab2357e614718bf6a8d022f4fba3429a689604
parentf70a623418a52eada0278002f8d266d49957b3d5
parent51f399686eb172baf7b27b300b8b84869fdb85fa
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
tests/examples/camerabin2/Makefile.am
gst-libs/gst/video/gstbasevideocodec.c
gst/camerabin2/gstcamerabin2.c
tests/examples/camerabin2/Makefile.am
tests/examples/camerabin2/gst-camera2.c