Merge branch 'v3-2-test' of git://git.samba.org/samba into SAMBA_3_2
authorJeremy Allison <jra@samba.org>
Thu, 11 Oct 2007 00:28:21 +0000 (17:28 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 11 Oct 2007 00:28:21 +0000 (17:28 -0700)
commitd588123885b8c90f2fea4e0c2e35fee9db5231a6
treead74ed0891e8a83d1f93036ddb38efec6861e864
parent39d30c54995b93c095dd8e367cff756c8a4b6e7f
parenteb7a53a5569775da53bf8e42275cf613b555e0f2
Merge branch 'v3-2-test' of git://git.samba.org/samba into SAMBA_3_2
(This used to be commit e00ea359d66347a7c6f5d75de1670f788bfdc310)