Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Wed, 28 May 2008 16:14:32 +0000 (09:14 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 28 May 2008 16:14:32 +0000 (09:14 -0700)

Trivial merge