Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 25 Jan 2012 12:14:51 +0000 (13:14 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 25 Jan 2012 12:14:51 +0000 (13:14 +0100)
commitb8ebb2f895c21114c337f3905a00e4d8058e6747
treeb70d637c99385fa73d056b6d0d9d43f70f2452f1
parentcf3d3fe00d36acf98b12bbdb5efacfca06eb82a2
parent39808588c0b56edfa1c4c77d86618742cffe1019
Merge branch 'master' into 0.11
configure.ac