Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Thu, 10 Jan 2008 01:08:20 +0000 (17:08 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 10 Jan 2008 01:08:20 +0000 (17:08 -0800)
commit9003e8e50fd308bb66bfbd635193e725b2442cbb
tree9c737da896df975094afe5bcb1739d2d942420b8
parent5df6018114ca54d97a7d67d554a090a56270d45e
parentba6eaa690622c8b3202135cb21b690df660afa63
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit f98c68a8a4882cb0a1b7e8985f3eba5ebb8287e3)