Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 9 May 2008 00:47:23 +0000 (10:47 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 9 May 2008 00:47:23 +0000 (10:47 +1000)
commit00ebe3df811a9eb7737fa6278d8784500c35bd14
treeb9b0291e764d49586bab6388353a59515353a66e
parentf446bf59e300a53f4564bcf99d8614b440905147
parentca6ac11b46a75bf02cf873c6aedb4f85af227168
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 2db0e86fb4abc27eed2d35e1d41122bc89a2c5fe)