r5030: svn merge -r5020:5029 svn+ssh://svn.samba.org/home/svn/samba/branches/SAMBA_3_...