Module Name:	src
Committed By:	christos
Date:		Sat Nov 27 01:39:50 UTC 2004

Modified Files:
	src/dist/am-utils/amd: amd.h amfs_host.c
	src/dist/am-utils/conf/transp: transp_sockets.c
	src/dist/am-utils/include: am_utils.h

Log Message:
fix merge botches.


To generate a diff of this commit:
cvs rdiff -r1.1.1.7 -r1.2 src/dist/am-utils/amd/amd.h
cvs rdiff -r1.4 -r1.5 src/dist/am-utils/amd/amfs_host.c
cvs rdiff -r1.6 -r1.7 src/dist/am-utils/conf/transp/transp_sockets.c
cvs rdiff -r1.8 -r1.9 src/dist/am-utils/include/am_utils.h

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