Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Sat, 12 Apr 2008 00:24:31 +0000 (17:24 -0700)
committerJeremy Allison <jra@samba.org>
Sat, 12 Apr 2008 00:24:31 +0000 (17:24 -0700)
(This used to be commit 6a965e72a8650b275222548445d10b65aa61e765)


Trivial merge