Merge branch 'v3-3-test' of git://git.samba.org/samba into 3.3-test
authorJim McDonough <jmcd@samba.org>
Tue, 13 May 2008 22:42:18 +0000 (18:42 -0400)
committerJim McDonough <jmcd@samba.org>
Tue, 13 May 2008 22:42:18 +0000 (18:42 -0400)
(This used to be commit 6dd44ebf22762e852b43e7dbcd095a58cc45abad)


Trivial merge