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

Trivial merge