Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Mon, 30 Jun 2008 18:27:40 +0000 (11:27 -0700)
committerJeremy Allison <jra@samba.org>
Mon, 30 Jun 2008 18:27:40 +0000 (11:27 -0700)
commit47be3281125392bb410da41cbfe2a2b4eebbc824
tree3ee5fc311a67ba81040c29a650da405b61cdbf2a
parentd05451c2c256e04870ebe6467f38585dad72f3a9
parent3d5872c64d5cefc3125702b4c1a3156161abfad2
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test