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)
commitdd54722176560d8c4bfad980973e48728090b968
treeed615e2e226dc718d56ea63dc9dd2200a813a58f
parentd5b34263cd0d1a29ffb657d359d7848fa33db819
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
tests/examples/camerabin2/Makefile.am