Merge in J.Layton patch and resolve conflict.
authorSimo Sorce <idra@samba.org>
Mon, 17 Dec 2007 14:43:18 +0000 (09:43 -0500)
committerSimo Sorce <idra@samba.org>
Mon, 17 Dec 2007 14:43:18 +0000 (09:43 -0500)
commit6b1a118eaaab405eeef0cf3c0488a2747af562ba
treeb285bd2df801f02a1c4f203ba8d4c89c2af13485
parent91be824d2ba0b8dccf42ba2b8555a204aa1fa56c
Merge in J.Layton patch and resolve conflict.
source/client/mount.cifs.c