[evolution/express2: 3/3] Merge branch 'express2-reduced-preferences' into express2

[Federico Mena Quintero <federico src gnome org>]

commit 8214b3e8419de4c914504c34500b91741ac1692a
Merge: 8c05d55 476bead
Author: Federico Mena Quintero <federico novell com>
Date:   Tue Apr 13 15:43:59 2010 -0500

    Merge branch 'express2-reduced-preferences' into express2

 e-util/e-config.c                         |   92 ++++++++++++++++++++++++-----
 plugins/bogo-junk-plugin/bf-junk-filter.c |   12 +++-
 plugins/sa-junk-plugin/em-junk-filter.c   |   12 +++-
 3 files changed, 97 insertions(+), 19 deletions(-)
---