Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into SAMBA_3_2_0
authorJeremy Allison <jra@samba.org>
Thu, 11 Oct 2007 00:56:55 +0000 (17:56 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 11 Oct 2007 00:56:55 +0000 (17:56 -0700)

Trivial merge