Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
authorJeremy Allison <jra@samba.org>
Fri, 29 Aug 2008 16:29:26 +0000 (09:29 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 29 Aug 2008 16:29:26 +0000 (09:29 -0700)

Trivial merge