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

Trivial merge