[evolution-kolab/gnome-3-4: 2/4] Merge branch 'EDS_IMAPX_nobuild-3-4' into gnome-3-4

[Christian Hilberg <chilberg src gnome org>]

commit a3b6a887af1753d34dfaca0930578bb1e395c16d
Merge: 47f57dc 112edec
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Wed May 30 18:12:53 2012 +0200

    Merge branch 'EDS_IMAPX_nobuild-3-4' into gnome-3-4
    
    Conflicts:
    	src/camel/providers/imapx/camel-imapx-server.c

 src/camel/providers/imapx/camel-imapx-folder.c |   17 ++++
 src/camel/providers/imapx/camel-imapx-server.c |   94 ++++++++++++++++++++----
 2 files changed, 95 insertions(+), 16 deletions(-)
---