[nwam-dev] fixed mismerge

[anurag.mas...@sun.com]

Author: Anurag S. Maskey <Anurag.Maskey at Sun.COM>
Repository: /hg/nwam/nwam1
Latest revision: 65e3204b8f7c41daf9a7c6191b9e4e14d456fb5d
Total changesets: 1
Log message:
fixed mismerge

Files:
        update: usr/src/Makefile
        update: usr/src/Makefile.lint
        update: usr/src/lib/Makefile