[evolution-kolab: 2/3] Merge branch 'EDS_IMAPX_nobuild' into ek-wip-porting-imapx

[Christian Hilberg <chilberg src gnome org>]

commit b6bbf2f00042d4bb3d5a44b62a44c6c3be1b92f3
Merge: 556eae8 9ed742a
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Mar 5 16:08:50 2012 +0100

    Merge branch 'EDS_IMAPX_nobuild' into ek-wip-porting-imapx

 src/camel/providers/imapx/camel-imapx-folder.c   |   30 ++++----
 src/camel/providers/imapx/camel-imapx-provider.c |    2 +-
 src/camel/providers/imapx/camel-imapx-server.c   |   77 +++++++++-------------
 src/camel/providers/imapx/camel-imapx-server.h   |    8 +-
 src/camel/providers/imapx/camel-imapx-store.c    |    2 +-
 src/camel/providers/imapx/camel-imapx-utils.c    |    4 +-
 6 files changed, 54 insertions(+), 69 deletions(-)
---