Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 4 Apr 2012 10:06:08 +0000 (12:06 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 4 Apr 2012 10:06:08 +0000 (12:06 +0200)

Trivial merge