Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
commitf6b2a57c9517202c554fa5a60bbe7ffd49b431f5
authorAndrew Bartlett <abartlet@samba.org>
Thu, 28 Feb 2008 23:56:56 +0000 (29 10:56 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 28 Feb 2008 23:56:56 +0000 (29 10:56 +1100)
treeb3a1e27af97c0871bf8a518b0f2aa5c823c7e8ec
parentf5b0f7a5fe6811c49661577540aaed248eda33a4
parentd115497478a4c60bc273d8f63756222eb135aa09
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 124d2ee788f1ac4b201a2843b58be21de358deb0)