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

[murch at andrew.cmu.edu]

Update of /afs/andrew/system/cvs/src/cyrus/timsieved
In directory unix32.andrew.cmu.edu:/var/tmp/cvs-serv5026/timsieved

Modified Files:
      Tag: cyrus-imapd-2_4
	parser.c timsieved.c 
Log Message:
merged changes from truck


committed with tag cyrus-imapd-2_4
--- links to diffs follow ---
http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/timsieved/parser.c.diff?r1=1.41.2.1&r2=1.41.2.2&only_with_tag=cyrus-imapd-2_4
http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/timsieved/timsieved.c.diff?r1=1.58.2.1&r2=1.58.2.2&only_with_tag=cyrus-imapd-2_4