Merge branch 'irc-dialog-579800'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 23 Apr 2009 09:55:30 +0000 (10:55 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 23 Apr 2009 09:55:30 +0000 (10:55 +0100)

Trivial merge