[evolution-data-server/camel-gobject-do-not-rebase: 4/7] Merge branch 'master' into camel-gobject

[Matthew Barnes <mbarnes src gnome org>]

commit 8c82015418b0d75288c791edb8c8780e2007ad1f
Merge: f5e6ce4... 222fc2a...
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Nov 22 10:57:05 2009 -0500

    Merge branch 'master' into camel-gobject

 .gitignore                                         |  106 ++++++++----
 Makefile.am                                        |   30 +++-
 addressbook/Makefile.am                            |    2 +
 addressbook/backends/Makefile.am                   |    2 +
 addressbook/backends/file/Makefile.am              |    2 +
 addressbook/backends/google/Makefile.am            |    2 +
 addressbook/backends/groupwise/Makefile.am         |    2 +
 addressbook/backends/ldap/Makefile.am              |    2 +
 addressbook/backends/vcf/Makefile.am               |    2 +
 addressbook/backends/webdav/Makefile.am            |    2 +
 addressbook/libebook/Makefile.am                   |    2 +
 addressbook/libedata-book/Makefile.am              |    2 +
 addressbook/tests/Makefile.am                      |    2 +
 addressbook/tests/ebook/Makefile.am                |    2 +
 addressbook/tests/vcard/Makefile.am                |    2 +
 art/Makefile.am                                    |    2 +
 calendar/Makefile.am                               |    2 +
 calendar/backends/Makefile.am                      |    2 +
 calendar/backends/caldav/Makefile.am               |    2 +
 calendar/backends/contacts/Makefile.am             |    2 +
 calendar/backends/file/Makefile.am                 |    2 +
 calendar/backends/google/Makefile.am               |    2 +
 calendar/backends/groupwise/Makefile.am            |    2 +
 calendar/backends/http/Makefile.am                 |    2 +
 calendar/backends/weather/Makefile.am              |    2 +
 calendar/libecal/Makefile.am                       |    2 +
 calendar/libecal/e-cal.c                           |  158 ++++++++++--------
 calendar/libedata-cal/Makefile.am                  |    2 +
 calendar/tests/Makefile.am                         |    3 +-
 calendar/tests/ecal/Makefile.am                    |    2 +
 camel/Makefile.am                                  |    2 +
 camel/providers/Makefile.am                        |    2 +
 camel/providers/groupwise/Makefile.am              |    2 +
 camel/providers/hula/Makefile.am                   |    2 +
 camel/providers/imap/Makefile.am                   |    2 +
 camel/providers/imap4/Makefile.am                  |    2 +
 camel/providers/imapx/Makefile.am                  |    2 +
 camel/providers/local/Makefile.am                  |    2 +
 camel/providers/nntp/Makefile.am                   |    2 +
 camel/providers/nntp/camel-nntp-summary.c          |    5 +-
 camel/providers/pop3/Makefile.am                   |    2 +
 camel/providers/sendmail/Makefile.am               |    2 +
 camel/providers/smtp/Makefile.am                   |    2 +
 camel/tests/Makefile.am                            |    2 +
 camel/tests/folder/Makefile.am                     |    2 +
 camel/tests/lib/Makefile.am                        |    2 +
 camel/tests/message/Makefile.am                    |    2 +
 camel/tests/mime-filter/Makefile.am                |    2 +
 camel/tests/misc/Makefile.am                       |    2 +
 camel/tests/smime/Makefile.am                      |    2 +
 camel/tests/stream/Makefile.am                     |    2 +
 docs/Makefile.am                                   |    3 +-
 docs/reference/.gitignore                          |   37 +++--
 docs/reference/Makefile.am                         |    2 +
 docs/reference/addressbook/Makefile.am             |    2 +
 docs/reference/addressbook/libebook/Makefile.am    |    2 +
 .../addressbook/libedata-book/Makefile.am          |    2 +
 docs/reference/calendar/Makefile.am                |    2 +
 docs/reference/calendar/libecal/Makefile.am        |    2 +
 docs/reference/calendar/libedata-cal/Makefile.am   |    2 +
 docs/reference/camel/Makefile.am                   |    2 +
 docs/reference/libebackend/Makefile.am             |    2 +
 docs/reference/libedataserver/Makefile.am          |    2 +
 docs/reference/libedataserverui/Makefile.am        |    2 +
 git.mk                                             |  178 ++++++++++++++++++++
 libebackend/Makefile.am                            |    2 +
 libedataserver/Makefile.am                         |    2 +
 libedataserverui/Makefile.am                       |    5 +
 servers/Makefile.am                                |    2 +
 servers/google/Makefile.am                         |    2 +
 servers/google/libgdata-google/Makefile.am         |    2 +
 servers/google/libgdata/Makefile.am                |    2 +
 servers/groupwise/Makefile.am                      |    2 +
 win32/Makefile.am                                  |    2 +
 74 files changed, 524 insertions(+), 131 deletions(-)
---
diff --cc .gitignore
index cfc2cfd,178bc53..b3c57c3
--- a/.gitignore
+++ b/.gitignore
@@@ -1,37 -1,149 +1,69 @@@
- # for all subdirectories
- Makefile.in
- Makefile
- .libs
- .deps
- *.o
- *.lo
- *.la
- .*.swp
- 
- # autofoo stuff here
- aclocal.m4
- autom4te.cache
- compile
- config.*
- configure
- depcomp
- gtk-doc.make
- install-sh
- intltool-*.in
- libtool
- ltmain.sh
- missing
- mkinstalldirs
- stamp-*
- INSTALL
- dolt*
- 
- # misc generated stuff
- *.pc
- *.server
- *-bindings.h
- *-glue.h
- *-marshal.[ch]
- *-enumtypes.[ch]
- iconv-detect.h
- *.service
+ /*.bak
+ /*.lo
+ /*.o
+ /*.orig
+ /*.rej
+ /*.tab.c
+ /*~
+ /.*.sw[nop]
+ /.deps
+ /.gitignore
+ /.libs
+ /GPATH
+ /GRTAGS
+ /GSYMS
+ /GTAGS
+ /ID
+ /INSTALL
+ /Makefile
+ /Makefile.in
+ /TAGS
+ /_libs
+ /aclocal.m4
+ /autom4te.cache
+ /autoscan.log
+ /compile
+ /config.cache
+ /config.guess
+ /config.h
+ /config.h.in
+ /config.log
+ /config.lt
+ /config.status
+ /config.status.lineno
+ /config.sub
+ /configure
+ /configure.lineno
+ /configure.scan
+ /depcomp
+ /evolution-data-server-1.2.pc
+ /evolution-data-server-zip
+ /evolution-data-server.pc
+ /gtk-doc.make
+ /iconv-detect.h
+ /install-sh
+ /intltool-extract.in
+ /intltool-merge.in
+ /intltool-update.in
+ /libtool
+ /ltmain.sh
+ /m4/gtk-doc.m4
+ /m4/intltool.m4
+ /m4/libtool.m4
+ /m4/ltoptions.m4
+ /m4/ltsugar.m4
+ /m4/ltversion.m4
+ /m4/lt~obsolete.m4
+ /missing
+ /mkinstalldirs
++/po/*.gmo
+ /po/*.mo
+ /po/.intltool-merge-cache
+ /po/Makefile
+ /po/Makefile.in
+ /po/Makefile.in.in
+ /po/POTFILES
 -/po/am.gmo
 -/po/ar.gmo
 -/po/as.gmo
 -/po/ast.gmo
 -/po/az.gmo
 -/po/be.gmo
 -/po/bg.gmo
 -/po/bn.gmo
 -/po/bn_IN.gmo
 -/po/bs.gmo
 -/po/ca.gmo
 -/po/cs.gmo
 -/po/cy.gmo
 -/po/da.gmo
 -/po/de.gmo
 -/po/dz.gmo
 -/po/el.gmo
 -/po/en shaw gmo
 -/po/en_AU.gmo
 -/po/en_CA.gmo
 -/po/en_GB.gmo
 -/po/es.gmo
 -/po/et.gmo
 -/po/eu.gmo
 -/po/fa.gmo
 -/po/fi.gmo
 -/po/fr.gmo
 -/po/ga.gmo
 -/po/gl.gmo
 -/po/gu.gmo
 -/po/he.gmo
 -/po/hi.gmo
 -/po/hr.gmo
 -/po/hu.gmo
 -/po/id.gmo
 -/po/is.gmo
 -/po/it.gmo
 -/po/ja.gmo
 -/po/ka.gmo
 -/po/kn.gmo
 -/po/ko.gmo
 -/po/ku.gmo
 -/po/lt.gmo
 -/po/lv.gmo
 -/po/mai.gmo
 -/po/mk.gmo
 -/po/ml.gmo
 -/po/mn.gmo
 -/po/mr.gmo
 -/po/ms.gmo
 -/po/nb.gmo
 -/po/ne.gmo
 -/po/nl.gmo
 -/po/nn.gmo
 -/po/oc.gmo
 -/po/or.gmo
 -/po/pa.gmo
 -/po/pl.gmo
 -/po/pt.gmo
 -/po/pt_BR.gmo
 -/po/ro.gmo
 -/po/ru.gmo
 -/po/rw.gmo
 -/po/si.gmo
 -/po/sk.gmo
 -/po/sl.gmo
 -/po/sq.gmo
 -/po/sr.gmo
 -/po/sr latin gmo
+ /po/stamp-it
 -/po/sv.gmo
 -/po/ta.gmo
 -/po/te.gmo
 -/po/th.gmo
 -/po/tr.gmo
 -/po/uk.gmo
 -/po/vi.gmo
 -/po/wa.gmo
 -/po/xh.gmo
 -/po/zh_CN.gmo
 -/po/zh_HK.gmo
 -/po/zh_TW.gmo
+ /so_locations
+ /stamp-h1
+ /tags