Merge remote-tracking branch 'em/trivia'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 13 Mar 2012 10:31:50 +0000 (11:31 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 13 Mar 2012 10:31:50 +0000 (11:31 +0100)

Trivial merge