Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
authorJeremy Allison <jra@samba.org>
Tue, 24 Jun 2008 01:57:00 +0000 (18:57 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 24 Jun 2008 01:57:00 +0000 (18:57 -0700)

Trivial merge