Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 12 Aug 2008 21:10:52 +0000 (14:10 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 12 Aug 2008 21:10:52 +0000 (14:10 -0700)

Trivial merge