Merge remote-tracking branch 'em/trivia'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 14 Mar 2012 09:04:54 +0000 (10:04 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 14 Mar 2012 09:04:54 +0000 (10:04 +0100)

Trivial merge