[evolution/kill-bonobo: 33/43] Merge branch 'master' into kill-bonobo

[Matthew Barnes <mbarnes src gnome org>]

commit 19b29348068e367efc105732e9707cdb4132b4ee
Merge: 9b1daa0... dfb0db7...
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed May 6 13:33:54 2009 -0400

    Merge branch 'master' into kill-bonobo
    
    Conflicts:
    	shell/e-shell-window-commands.c

 calendar/gui/alarm-notify/alarm-queue.c |   10 +-
 calendar/gui/e-cal-list-view.c          |    1 -
 calendar/gui/e-day-view.c               |    1 -
 calendar/gui/e-meeting-time-sel.c       |    1 -
 calendar/gui/e-week-view.c              |    1 -
 e-util/e-dialog-widgets.c               |   34 --
 e-util/e-dialog-widgets.h               |    3 -
 mail/ChangeLog                          |   16 +
 mail/em-composer-utils.c                |   27 +-
 mail/mail-ops.c                         |    3 +-
 po/nb.po                                |  914 +++++++++++++++----------------
 po/or.po                                |  591 ++++++++-------------
 widgets/misc/e-attachment-view.c        |    4 +-
 13 files changed, 691 insertions(+), 915 deletions(-)