Merge branch 'master' of https://git.maemo.org/projects/modest
authorJose Dapena Paz <jdapena@igalia.com>
Wed, 14 Oct 2009 13:41:21 +0000 (15:41 +0200)
committerJose Dapena Paz <jdapena@igalia.com>
Wed, 14 Oct 2009 13:41:21 +0000 (15:41 +0200)

Trivial merge