Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 8 Dec 2011 17:32:19 +0000 (17:32 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 8 Dec 2011 17:32:19 +0000 (17:32 +0000)

Trivial merge