Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 28 Feb 2008 23:09:35 +0000 (10:09 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 28 Feb 2008 23:09:35 +0000 (10:09 +1100)
commitf002a98c7ae0fc93cc738fde1ee62534f8e576ac
tree744ad9714ed946a5ee0f7168ee67df0f38bfad5e
parent04db9b184491415b3479fd79e1c07ba738818eb9
parentee170c85e0e76411bd752de5fe51db6940dab929
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local