Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 28 Mar 2008 00:10:19 +0000 (11:10 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 28 Mar 2008 00:10:19 +0000 (11:10 +1100)
commit3d9589ba5a1b50a71d29f4b6a119da72264816d0
tree51d1b2f7b9a4ccd985c9f6912c2e8e14ef7d7790
parent392fd9686523fe5e1cd6b6c080c5f168f5556d3e
parent0cffe980495c718494c7a879bfe5939c62e908ac
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit ddf9d6ef70f0a6b7da420f772b34962fb25d761a)