Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commit0d989bf90b9b75a057b572bb4369ee3126db1fb8
authorJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 23:09:35 +0000 (15 15:09 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 23:09:35 +0000 (15 15:09 -0800)
tree65b000a0c0edc513bb24b6c5323ceb0594bd052b
parente57856fff2ef86481ac6770c7d010a26666d8bdd
parent1df8f98602ac4be1d37f9c7748da8b89db80215f
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test