Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Thu, 8 Nov 2007 23:13:41 +0000 (15:13 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 8 Nov 2007 23:13:41 +0000 (15:13 -0800)
(This used to be commit d9335456d23271a4b15b97d24f1b263700a3b9df)


Trivial merge