Merge commit 'c5544630250ec434e4dafaf17274e83865415120' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 21:20:38 +0000 (21:20 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 21:20:38 +0000 (21:20 +0000)

Trivial merge