Sync up to the latest version of my source codemaster
treec9213932ca547dbe1c9e101f5bc73478e5126351
drwxr-xr-x - funambol-citadel-connector
drwxr-xr-x - jcitadel