[evolution/express2: 2/2] Merge branch 'gnome-2-30' into express2

[Matthew Barnes <mbarnes src gnome org>]

commit 8c05d550d822e3621eb91be9b48379fd3531fc97
Merge: 41cf6f9 e8745fb
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Apr 12 20:58:48 2010 -0400

    Merge branch 'gnome-2-30' into express2

 calendar/gui/e-cal-model.c              |    2 ++
 modules/calendar/e-cal-shell-sidebar.c  |    3 +++
 modules/calendar/e-memo-shell-sidebar.c |    3 +++
 modules/calendar/e-task-shell-sidebar.c |    3 +++
 4 files changed, 11 insertions(+), 0 deletions(-)
---