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

Trivial merge