Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 29 Mar 2012 13:10:09 +0000 (15:10 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 29 Mar 2012 13:10:09 +0000 (15:10 +0200)

Trivial merge