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 17:19:45 +0000 (10:19 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 30 Oct 2007 17:19:45 +0000 (10:19 -0700)
commit9da9423f21bae8e714e735f7493eef8ddb4760df
tree2e042ebf96227be72f2eb7a16f14be9fe433eefa
parent0af071d7628106e3d919018ed8604c9da2af4d50
parent851ef9e22f5f58202b0c5594b4432941afb0e130
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit c833c336435cffd20579903d22ccb910ab467e53)