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

Trivial merge