Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commit78d88cbaeb21915ffdba45f1844cfd2a8534c874
authorJeremy Allison <jra@samba.org>
Thu, 17 Apr 2008 16:25:45 +0000 (17 09:25 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 17 Apr 2008 16:25:45 +0000 (17 09:25 -0700)
tree5ceb07b818ff30cbd02f8c5ef7f842864595950a
parent4939a24cbc751719b008bdd474181fffabd33934
parent5c29bc8931d025de4ec91247be04da4388642727
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit d665cecd8b1b40ad30ec435de0bd925cdea24795)