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)
commitd20608c8f314476ca7dde8a9a61495431b4bccff
tree353570247ae5e32d936a8519c36004466f464a14
parent9f5a16a22da812ed58dcb46979ab5ae27d3a905e
Merge in J.Layton patch and resolve conflict.
(This used to be commit 6b1a118eaaab405eeef0cf3c0488a2747af562ba)
source3/client/mount.cifs.c