Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
authorJeremy Allison <jra@samba.org>
Sat, 5 Jan 2008 01:15:50 +0000 (17:15 -0800)
committerJeremy Allison <jra@samba.org>
Sat, 5 Jan 2008 01:15:50 +0000 (17:15 -0800)

Trivial merge