Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel
commit98b2fbef5273b055242e24490736b0c9677b1732
authorJeremy Allison <jra@samba.org>
Thu, 4 Sep 2008 18:51:55 +0000 (4 11:51 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 4 Sep 2008 18:51:55 +0000 (4 11:51 -0700)
tree5876ece3b30c0febc049f7504f3f65479a138083
parentcb2d488e1dbd90953c496c5e25d648977884f7e3
parent18a26f08b6fab4119a1421a7ca59c32dde8bb8cb
Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel