Merge commit 'f9207722ca8fd8dcc1e7215d8af85efe4debfdf4' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 27 Feb 2012 00:56:37 +0000 (00:56 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 27 Feb 2012 00:56:37 +0000 (00:56 +0000)

Trivial merge