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

[Michael Meeks <michael src gnome org>]

commit 69ee9bcccbe42f413c5acf99093f553918991651
Merge: 3cc02e8 bde1bc6
Author: Michael Meeks <michael meeks novell com>
Date:   Tue May 11 15:42:14 2010 +0100

    Merge commit 'origin/express2' into express2

 modules/calendar/e-cal-shell-view-actions.c |   26 +++++++++++++++++++++++
 shell/e-shell-view.c                        |    3 +-
 shell/e-shell-window-actions.c              |    8 +++++++
 shell/e-shell-window-private.h              |    1 +
 shell/e-shell-window.c                      |   30 +++++++++++++++++++++++++++
 shell/e-shell-window.h                      |    1 +
 ui/evolution-calendars.ui                   |    7 +++++-
 ui/evolution-shell.ui                       |    2 +
 8 files changed, 76 insertions(+), 2 deletions(-)
---