Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Thu, 27 Mar 2008 23:48:44 +0000 (16:48 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 27 Mar 2008 23:48:44 +0000 (16:48 -0700)
(This used to be commit 64d4f290cf0aad962a0a3356473632a58e0e34df)


Trivial merge