Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
authorJeremy Allison <jra@samba.org>
Sat, 31 May 2008 06:13:23 +0000 (23:13 -0700)
committerJeremy Allison <jra@samba.org>
Sat, 31 May 2008 06:13:23 +0000 (23:13 -0700)

Trivial merge