[evolution: 4/4] Merge branch 'string-changes-2.31'

[Matthew Barnes <mbarnes src gnome org>]

commit 532249a3e5fc8d923c3ad2188f658a7321b8ee95
Merge: 30bcf40 ebf898a
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Mar 27 18:48:46 2010 -0400

    Merge branch 'string-changes-2.31'

 calendar/gui/dialogs/cal-prefs-dialog.c     |    4 ++--
 mail/mail-config.ui                         |    2 +-
 modules/addressbook/autocompletion-config.c |    2 +-
 plugins/bbdb/bbdb.c                         |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
---