[clearview-dev] /export/ws/clearview/clearview: more merge problems

[sebastien....@sun.com]

Author:    Sebastien Roy <Sebastien.Roy at Sun.COM>
Changeset: 10366:788efb2aadd9
Comments:
more merge problems

Files:
usr/src/cmd/dlmgmtd/dlmgmt_door.c