Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 30 Oct 2007 19:55:56 +0000 (12:55 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 30 Oct 2007 19:55:56 +0000 (12:55 -0700)
commit4367f4b4d4ce075f3fe8e88e68dbda47e2252349
tree3270a75923fc0824eebcc9419841b348161fe251
parent9da9423f21bae8e714e735f7493eef8ddb4760df
parentf5dcac6e8ed17a45d82ce395b01f8d5418a11331
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 765b37c693516757686118fffd3c80cf4d5e7344)