Merge branch 'modest-3-0' into part-to-stream-in-plugins part-to-stream-in-plugins
authorJose Dapena Paz <jdapena@igalia.com>
Wed, 2 Sep 2009 09:17:26 +0000 (11:17 +0200)
committerJose Dapena Paz <jdapena@igalia.com>
Wed, 2 Sep 2009 09:17:26 +0000 (11:17 +0200)

Trivial merge