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:46:17 +0000 (17:46 -0700)
committerJeremy Allison <jra@samba.org>
Sat, 12 Apr 2008 00:46:17 +0000 (17:46 -0700)
(This used to be commit 7258c780f0650c63d6c7c40fd704a9b841600f26)


Trivial merge