r23130: merge Derrell's change from SAMBA_3_0_25 svn r23120