Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 13 Jan 2012 00:11:54 +0000 (00:11 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 13 Jan 2012 00:11:54 +0000 (00:11 +0000)

Trivial merge