Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 8 Mar 2011 10:14:20 +0000 (10:14 +0000)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 8 Mar 2011 10:14:20 +0000 (10:14 +0000)
commita4fdb8ee44b7300859b7852b20e4c988ee035727
tree8ce982ec2d40145e2f51854dae7b109820a92a5a
parent4ac7184454c1c7ab4eb36a0277d58025e13bed36
parent1f7f434df6dedf896d2925560e36a1fe0875763e
Merge branch 'master' into 0.11

Conflicts:
tests/examples/cairo/Makefile.am
sys/v4l2/gstv4l2object.c