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)
commite00ea359d66347a7c6f5d75de1670f788bfdc310
tree539f257756ddab665a4209a4b778af0dd5229ca6
parent183df4754b5f18419f4d8fca2c0fa19919174556
parentbe916777da8c681c393b817105e3dfe8a9c4ef12
Merge branch 'v3-2-test' of git://git.samba.org/samba into SAMBA_3_2