Module Name:	src
Committed By:	ad
Date:		Fri Feb  9 22:13:31 UTC 2007

Modified Files:
	src/distrib/sets/lists/comp: mi
	src/include: Makefile

Log Message:
Sync with changes introduced by merging the newlock2 branch.


To generate a diff of this commit:
cvs rdiff -r1.996 -r1.997 src/distrib/sets/lists/comp/mi
cvs rdiff -r1.125 -r1.126 src/include/Makefile

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