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)
(This used to be commit e00ea359d66347a7c6f5d75de1670f788bfdc310)


Trivial merge