Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Thu, 27 Mar 2008 23:48:44 +0000 (16:48 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 27 Mar 2008 23:48:44 +0000 (16:48 -0700)
commitf57489a372360b2b9a4a41a16a8b44fa766e0b41
tree632afcaf3aeb853e696f7c0a79a8ec0e63607e94
parent7752494cf199d6edcce021baa81f2148e3c7ba4d
parent4c17fce8dc615d9b9dc50cebe63d5b5054936a3c
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 64d4f290cf0aad962a0a3356473632a58e0e34df)