r3779: svn merge -r 3776:3778 $SVNURL/branches/SAMBA_3_0