Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 16 Apr 2008 15:35:32 +0000 (17:35 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 16 Apr 2008 15:35:32 +0000 (17:35 +0200)
commitf9ca1a80c6e6a4f3d81b414701fe37b11aa64fae
tree2d35f3d004277feb04a19fdf60f85cd3d5a29674
parent80ad7025cfb3cd7ec13da461125515fdb10fa94f
parentd49f94621bd1d18437d5846d61b84054f35d39e4
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit eab5f6a7f5efa8608cb23af2cab8ab19f9f62485)