r6284: Starting on 3.0.14:

r6284: Starting on 3.0.14:

svn merge -r6016:6020 ../samba_3_0/
svn merge -r6034:6036 ../samba_3_0/
svn merge -r6060:6062 ../samba_3_0/
svn merge -r6062:6063 ../samba_3_0/
svn merge -r6110:6116 ../samba_3_0/
svn merge -r6152:6154 ../samba_3_0/
svn merge -r6157:6158 ../samba_3_0/
svn merge -r6163:6164 ../samba_3_0/
svn merge -r6167:6169 ../samba_3_0/
svn merge -r6174:6175 ../samba_3_0/
svn merge -r6175:6176 ../samba_3_0/
svn merge -r6204:6216 ../samba_3_0/
svn merge -r6216:6217 ../samba_3_0/
svn merge -r6232:6234 ../samba_3_0/
svn merge -r6234:6235 ../samba_3_0/
svn merge -r6242:6243 ../samba_3_0/
svn merge -r6255:6256 ../samba_3_0/
svn merge -r6279:6281 ../samba_3_0/

TO view the change log from SAMBA_3_0, run:

for rev in 6020 6036 6062 6063 6116 6154 6158 6164 6169 \
6175 6176 6216 6217 6234 6235 6243 6256 6281; do
        svn log -r$rev svn://svnanon.samba.org/samba/branches/SAMBA_3_0
done