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)
Conflicts:
configure.ac


Trivial merge