Merge remote-tracking branch 'origin/0.10'
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 7 Apr 2012 15:35:27 +0000 (16:35 +0100)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 7 Apr 2012 15:35:27 +0000 (16:35 +0100)

Trivial merge