Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
authorJeremy Allison <jra@samba.org>
Fri, 6 Jun 2008 22:02:56 +0000 (15:02 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 6 Jun 2008 22:02:56 +0000 (15:02 -0700)

Trivial merge