Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 21:15:31 +0000 (21:15 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 21:15:31 +0000 (21:15 +0000)

Trivial merge