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)
commitc833c336435cffd20579903d22ccb910ab467e53
treefcf7ffa868cb42744e2946e735666bbb664fc377
parentd5886218e53910b7015e6f13bc634e1bf338565a
parent95f76ae7a52c6b22db22d03fed6b0848d2a61bee
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test