Merge from Samba 3.0: