Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 11 Mar 2008 22:26:22 +0000 (15:26 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 11 Mar 2008 22:26:22 +0000 (15:26 -0700)
commit2e2302259f77822e1a08df4a30d5ffe33bcba657
treef49425c249dc76f589582feef9265ac8de6a6d39
parent7d2c9c67fd5e4ebcedc5774fb8a24bee985b8fc8
parent5d3a31fbe1e9ebb56829eab10066a90e76f88168
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 1de05f1a87fcea598021ca485d3ed87005a3be68)