Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Sat, 12 Apr 2008 00:46:17 +0000 (17:46 -0700)
committerJeremy Allison <jra@samba.org>
Sat, 12 Apr 2008 00:46:17 +0000 (17:46 -0700)
commit7258c780f0650c63d6c7c40fd704a9b841600f26
treee7c003f21af902ca8c539577ed16947041a663db
parent12e6818df1c77810a59a2896f8c44c91fc24e7ae
parent27fea343d2eeff5b7d38092dd1286cb8e3478cbe
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test