Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorSteve French <stevef@smfhomehp.(none)>
Tue, 26 Aug 2008 20:27:07 +0000 (15:27 -0500)
committerSteve French <stevef@smfhomehp.(none)>
Tue, 26 Aug 2008 20:27:07 +0000 (15:27 -0500)

Trivial merge