Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 26 Dec 2011 00:12:57 +0000 (00:12 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 26 Dec 2011 00:12:57 +0000 (00:12 +0000)

Trivial merge