Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 18:31:47 +0000 (10:31 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 18:31:47 +0000 (10:31 -0800)
(This used to be commit ed7322dcfa6f42743b784246f5de74d4e64b0765)


Trivial merge