r25432: Merge module linking changes from SAMBA_3_2 to SAMBA_3_2_0 to reduce