r17143: svn merge -r17091:17138 ../SAMBA_3_0_23/