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


Trivial merge