Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
authorJeremy Allison <jra@samba.org>
Fri, 30 May 2008 17:09:22 +0000 (10:09 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 30 May 2008 17:09:22 +0000 (10:09 -0700)

Trivial merge