[Cyrus-CVS] src/cyrus/master by murch

[murch at andrew.cmu.edu]

Update of /afs/andrew/system/cvs/src/cyrus/master
In directory unix35.andrew.cmu.edu:/var/tmp/cvs-serv8282/master

Modified Files:
      Tag: cyrus-imapd-2_4
	Makefile.in master.c master.h service.c 
Removed Files:
      Tag: cyrus-imapd-2_4
	message_uuid_master.c message_uuid_master.h 
Log Message:
merged changes from trunk (2.3.9->2.3.10)


committed with tag cyrus-imapd-2_4
--- links to diffs follow ---
http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/master/Makefile.in.diff?r1=1.22&r2=1.22.2.1&only_with_tag=cyrus-imapd-2_4
http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/master/master.c.diff?r1=1.104&r2=1.104.2.1&only_with_tag=cyrus-imapd-2_4
http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/master/master.h.diff?r1=1.14&r2=1.14.2.1&only_with_tag=cyrus-imapd-2_4
http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/master/service.c.diff?r1=1.55&r2=1.55.2.1&only_with_tag=cyrus-imapd-2_4
DELETED http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/master/message_uuid_master.c
DELETED http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/master/message_uuid_master.h