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)
commit2ca5098e3591fa006a90f2f44dc1d5455f501703
treeea90fcb78e241496e8cc1c9e5ae70022b4012050
parenta6b0ea8ee341fde28e568f8e1a4f16d9a89425c8
parentb8398d19af01cbdaec3af6c264e4d073fa85f78d
Merge branch 'v3-3-test' of git://git.samba.org/samba into 3.3-test
(This used to be commit 6dd44ebf22762e852b43e7dbcd095a58cc45abad)