[evolution/wip/gsettings: 7/7] Merge branch 'master' into wip/gsettings

[Rodrigo Moya <rodrigo src gnome org>]

commit 0849af1df6b923a534b3982406d690bb344355ab
Merge: 5182ae7 bcf8dbb
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Wed Nov 2 14:41:55 2011 +0100

    Merge branch 'master' into wip/gsettings

 addressbook/gui/widgets/eab-contact-display.c |   43 +++++++++++++++++++-----
 addressbook/gui/widgets/eab-gui-util.c        |    1 +
 addressbook/util/eab-book-util.c              |    1 +
 mail/em-account-editor.c                      |   31 +++++++++++++++---
 plugins/google-account-setup/google-source.c  |    2 +-
 5 files changed, 63 insertions(+), 15 deletions(-)
---