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

Trivial merge