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)

Trivial merge