Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 3 May 2011 07:49:26 +0000 (09:49 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 3 May 2011 07:49:26 +0000 (09:49 +0200)
commitc3b778f9b1df334ee81c582930fda13246684d23
treedb280d52b6e238e8fe84b8174015d1a6a8617cd6
parentabcbef287dbd5861d8716141d5243aca55c9c439
parentd08e695a83f33b51f4ed9939339900b2a8b0ef1a
Merge branch 'master' into 0.11

Conflicts:
configure.ac