Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 30 Oct 2007 19:55:56 +0000 (12:55 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 30 Oct 2007 19:55:56 +0000 (12:55 -0700)
(This used to be commit 765b37c693516757686118fffd3c80cf4d5e7344)


Trivial merge