Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 22 Feb 2008 21:38:03 +0000 (13:38 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 22 Feb 2008 21:38:03 +0000 (13:38 -0800)
(This used to be commit bcc5371b8e7f369e8d830d9cf687089514997248)


Trivial merge