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 17:19:45 +0000 (10:19 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 30 Oct 2007 17:19:45 +0000 (10:19 -0700)
(This used to be commit c833c336435cffd20579903d22ccb910ab467e53)


Trivial merge