Merge from 3.0:
authorTim Potter <tpot@samba.org>
Thu, 9 Oct 2003 06:13:11 +0000 (06:13 +0000)
committerTim Potter <tpot@samba.org>
Thu, 9 Oct 2003 06:13:11 +0000 (06:13 +0000)
commit6188988e432ea84921bb70b27842f1e911d4ebf7
tree394f14201249437c39bf4dd975aef46eb477d0a7
parent52aa3c5425c14dcb1f2157c04a869673721fc35b
Merge from 3.0:

>Portability fix from Joachim Schmitz.  Closes bug #546.
(This used to be commit eb9f5c0ec1ad01c05bb8f380f417e6cd2c111ce3)
source3/modules/vfs_recycle.c