[evolution/express2: 5/5] Merge commit 'origin/express2' into express2

[Michael Meeks <michael src gnome org>]

commit 5c3c40aec8f72c5e33d77e47959d4ba485c4b97f
Merge: b9a0dc4 8214b3e
Author: Michael Meeks <michael meeks novell com>
Date:   Wed Apr 14 21:03:53 2010 +0100

    Merge commit 'origin/express2' into express2

 calendar/gui/e-cal-model.c                |    2 +
 e-util/e-config.c                         |   92 ++++++++++++++++++++++++-----
 modules/calendar/e-cal-shell-sidebar.c    |    3 +
 modules/calendar/e-memo-shell-sidebar.c   |    3 +
 modules/calendar/e-task-shell-sidebar.c   |    3 +
 plugins/bogo-junk-plugin/bf-junk-filter.c |   12 +++-
 plugins/sa-junk-plugin/em-junk-filter.c   |   12 +++-
 7 files changed, 108 insertions(+), 19 deletions(-)
---