Merge branch 'master' of /tmp/funambol-groupdav-connector