Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
authorJeremy Allison <jra@samba.org>
Mon, 30 Jun 2008 16:16:15 +0000 (09:16 -0700)
committerJeremy Allison <jra@samba.org>
Mon, 30 Jun 2008 16:16:15 +0000 (09:16 -0700)

Trivial merge