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)
Conflicts:
tests/examples/camerabin2/Makefile.am


No differences found