Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Wed, 2 Nov 2011 16:34:07 +0000 (16:34 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Wed, 2 Nov 2011 16:34:07 +0000 (16:34 +0000)

Trivial merge