Merge commit 'kaserf/buttons-infobar-606329'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 25 Jan 2010 14:19:05 +0000 (14:19 +0000)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 25 Jan 2010 14:19:05 +0000 (14:19 +0000)
commit6a09345e6cc8002dcb2da52da273c949107b9de3
treee38784ff991283c58bbcd84561c7725a7302e4ac
parent906f3a0b0c501c9878c7ad1f77d6d3b9a36361dc
parent5c94274e5bd070ea580716fe8dbaad32b901654e
Merge commit 'kaserf/buttons-infobar-606329'