Merge remote branch 'glassrose/accounts-supporting-chatrooms-only-603027'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 10 Jan 2011 10:02:02 +0000 (11:02 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 10 Jan 2011 10:02:02 +0000 (11:02 +0100)

Trivial merge