r8329: merging changes from SAMBA_3_0 and setting version to 3.0.20pre2