Matthew Barnes 85b2913a38 Merge revisions 36534:36684 from trunk. ...

svn path=/branches/kill-bonobo/; revision=36685

2008-10-24 23:52:05 +00:00

..

libecalendar-common-conduit.c

Merge revisions 36534:36684 from trunk.

2008-10-24 23:52:05 +00:00

libecalendar-common-conduit.h

Merge revisions 36016:36303 from trunk.

2008-09-11 15:34:29 +00:00

Makefile.am

Merge revisions 36534:36684 from trunk.

2008-10-24 23:52:05 +00:00