Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 18 Dec 2007 01:03:07 +0000 (17:03 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 18 Dec 2007 01:03:07 +0000 (17:03 -0800)
(This used to be commit 8223624fea7c1b61e9231168cb4d82771576cbc5)


Trivial merge