Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 8 Oct 2011 14:34:45 +0000 (15:34 +0100)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 8 Oct 2011 14:34:45 +0000 (15:34 +0100)

Trivial merge