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)
commit6fe4d3196192eabbd4fc8fb8e931e5663da2cc9f
tree5b698f66a91207ca1077ad16f669ada416d7452d
parent0c056a04fef958d26e93824d276541d8f2c3dcad
parentc5544630250ec434e4dafaf17274e83865415120
Merge commit 'c5544630250ec434e4dafaf17274e83865415120' into 0.11