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

Trivial merge