Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Mon, 19 May 2008 22:27:08 +0000 (08:27 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 19 May 2008 22:27:08 +0000 (08:27 +1000)
commit28b2fa86239b96eae73cd9199ae678391f6d4012
tree24916fd790f60d579af71d7b5b63134ddb45b7db
parent868c45102d98f4207e614d79af2f37dbb0418203
parent1b4b8d5e78e553c759c16c1605b610498fddf77b
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 69bac908bec3216d2f17042aa05ab8d4b55b0918)