Merge branch 'v3-3-test' of git://git.samba.org/samba into 3-3
authorSteve French <stevef@smfhomehp.(none)>
Tue, 24 Feb 2009 17:26:56 +0000 (11:26 -0600)
committerSteve French <stevef@smfhomehp.(none)>
Tue, 24 Feb 2009 17:26:56 +0000 (11:26 -0600)

Trivial merge