Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 8 Mar 2012 19:49:59 +0000 (19:49 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 8 Mar 2012 19:49:59 +0000 (19:49 +0000)

Trivial merge