Module Name:	gnusrc
Committed By:	itojun
Date:		Tue Apr  3 01:01:08 UTC 2001

Modified Files:
	gnusrc/gnu/dist/postfix/src/global: tok822_parse.c
	gnusrc/gnu/dist/postfix/src/util: sys_defs.h

Log Message:
resolve conflicts on upgrade to pl1.
sorry, forgot to commit it last night!


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/postfix/src/global/tok822_parse.c
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/postfix/src/util/sys_defs.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.