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

Trivial merge