Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commit089227e52012f307c311530f9b677cad81ef0105
authorJeremy Allison <jra@samba.org>
Wed, 13 Feb 2008 01:56:02 +0000 (12 17:56 -0800)
committerJeremy Allison <jra@samba.org>
Wed, 13 Feb 2008 01:56:02 +0000 (12 17:56 -0800)
tree2c7123aa33e2c886031308889ec96453fb7ce55d
parenta6997bb2ffbca8f38d40f2631066c23b0472e13c
parentfbe8014b650d1b104d1a7624669fa92fbc6605b8
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 5116c9d9f4bd1a523ac7a2a31b3b1552388f040f)