[evolution-data-server/camel-socks-proxy: 50/50] Merge branch 'gnome-2-30' into camel-socks-proxy

[Federico Mena Quintero <federico src gnome org>]

commit d4f0f65a53f0163e410a06684ac4c3404f5fd989
Merge: 192ec4d 4eef233
Author: Federico Mena Quintero <federico novell com>
Date:   Fri Sep 24 11:43:50 2010 -0500

    Merge branch 'gnome-2-30' into camel-socks-proxy

 NEWS                                               |   18 +
 .../backends/webdav/e-book-backend-webdav.c        |   16 +-
 addressbook/libedata-book/e-data-book-factory.c    |   33 +
 calendar/backends/caldav/e-cal-backend-caldav.c    |    3 +
 calendar/libedata-cal/e-data-cal-factory.c         |   33 +
 camel/Makefile.am                                  |    3 +-
 camel/camel-net-utils-win32.h                      |  381 ---
 camel/camel-net-utils.c                            |    6 +-
 camel/camel-operation.c                            |   47 +-
 camel/providers/imapx/camel-imapx-folder.c         |   80 +-
 camel/providers/imapx/camel-imapx-folder.h         |   19 +-
 camel/providers/imapx/camel-imapx-provider.c       |   25 +-
 camel/providers/imapx/camel-imapx-server.c         |  586 ++++--
 camel/providers/imapx/camel-imapx-server.h         |   23 +-
 camel/providers/imapx/camel-imapx-store.c          |  159 +-
 camel/providers/imapx/camel-imapx-store.h          |   20 +-
 camel/providers/imapx/camel-imapx-stream.c         |   18 +-
 camel/providers/imapx/camel-imapx-stream.h         |   14 +-
 camel/providers/imapx/camel-imapx-summary.c        |   49 +-
 camel/providers/imapx/camel-imapx-summary.h        |    4 +-
 camel/providers/imapx/camel-imapx-utils.c          |   54 +-
 camel/providers/imapx/camel-imapx-utils.h          |   22 +-
 camel/providers/imapx/camel-imapx-view-summary.c   |   16 +-
 camel/providers/imapx/camel-imapx-view-summary.h   |   16 +-
 camel/providers/imapx/test-imapx.c                 |   19 +
 configure.ac                                       |    5 +-
 po/de.po                                           |  828 ++++----
 po/zh_CN.po                                        | 2451 +++++++++++---------
 28 files changed, 2679 insertions(+), 2269 deletions(-)
---