Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Thu, 28 Feb 2008 10:22:31 +0000 (02:22 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 28 Feb 2008 10:22:31 +0000 (02:22 -0800)
(This used to be commit 22c38c040c37d1e3922be45f22cfb4e7b733df9b)


Trivial merge