Merge remote-tracking branch 'alip/find_message-v3'
authorDavid Bremner <bremner@debian.org>
Tue, 4 Oct 2011 10:35:40 +0000 (07:35 -0300)
committerDavid Bremner <bremner@debian.org>
Tue, 4 Oct 2011 10:35:40 +0000 (07:35 -0300)

Trivial merge