Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 30 Jan 2008 00:47:52 +0000 (11:47 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 30 Jan 2008 00:47:52 +0000 (11:47 +1100)
commit8011716734cb8e3c34f85d9d68201f13cb5b8e0a
tree0875f24e29652c118d06ca76f6fb9999aa97d94b
parent81a0a7967b8f659f1f35a7a25de469725417ab43
parent421bdd203eab09e560f4919715fa4cc4497e406f
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet