r19706: merge up to r19705 from SAMBA_3_0 (good for 3.0.23d now)