r5995: merging more changes from 3.0 tree.
Now just have to work on the acl bug (#2521) and we're
ready to ship.
svn merge -r5945:5946 $SVNURL/branches/SAMBA_3_0
svn merge -r5945:5946 $SVNURL/branches/SAMBA_3_0
svn merge -r5954:5955 $SVNURL/branches/SAMBA_3_0
svn merge -r5965:5967 $SVNURL/branches/SAMBA_3_0
svn merge -r5968:5970 $SVNURL/branches/SAMBA_3_0
svn merge -r5970:5971 $SVNURL/branches/SAMBA_3_0
svn merge -r5971:5973 $SVNURL/branches/SAMBA_3_0
svn merge -r5973:5975 $SVNURL/branches/SAMBA_3_0
svn merge -r5975:5979 $SVNURL/branches/SAMBA_3_0
svn merge -r5979:5981 $SVNURL/branches/SAMBA_3_0
svn merge -r5981:5991 $SVNURL/branches/SAMBA_3_0
svn merge -r5993:5994 $SVNURL/branches/SAMBA_3_0