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

Trivial merge