[evolution-data-server/mmeeks-gdbus-import: 16/16] Merge branch 'master' into mmeeks-gdbus-import

[Michael Meeks <michael src gnome org>]

commit 803d9eee3c9678b488d2da4c4a69352bed6f2bfc
Merge: 599d6b6 c5a86b3
Author: Michael Meeks <michael meeks novell com>
Date:   Mon Mar 1 12:18:32 2010 +0000

    Merge branch 'master' into mmeeks-gdbus-import
    
    Conflicts:
    	camel/providers/imapx/camel-imapx-server.c

 camel/Makefile.am                           |    1 -
 camel/camel-folder-summary.c                |    4 +-
 camel/providers/imapx/camel-imapx-folder.c  |   13 +
 camel/providers/imapx/camel-imapx-server.c  |  109 +++--
 camel/providers/imapx/camel-imapx-server.h  |    1 +
 camel/providers/imapx/camel-imapx-stream.c  |   34 +-
 camel/providers/imapx/camel-imapx-utils.c   |    8 +-
 libedataserverui/e-name-selector-dialog.c   |    2 +
 libedataserverui/e-source-selector-dialog.c |   16 +
 po/fr.po                                    |  794 ++++++++++++++-------------
 po/sv.po                                    |  801 ++++++++++++++-------------
 11 files changed, 944 insertions(+), 839 deletions(-)
---