Merge Samba 3.0 pdb_ldap from 3.0 into HEAD, so as to allow idra to continue