Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 11 Mar 2008 22:26:22 +0000 (15:26 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 11 Mar 2008 22:26:22 +0000 (15:26 -0700)
(This used to be commit 1de05f1a87fcea598021ca485d3ed87005a3be68)


Trivial merge