Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
authorJeremy Allison <jra@samba.org>
Mon, 5 May 2008 23:29:21 +0000 (16:29 -0700)
committerJeremy Allison <jra@samba.org>
Mon, 5 May 2008 23:29:21 +0000 (16:29 -0700)
(This used to be commit bb8f098cdfd902bbb36426df2c4f8532881b3fcd)


Trivial merge