Merge branch 'v3-0-test' of git://git.samba.org/samba into 3.0-test
authorJim McDonough <jmcd@samba.org>
Tue, 27 May 2008 09:32:20 +0000 (05:32 -0400)
committerJim McDonough <jmcd@samba.org>
Tue, 27 May 2008 09:32:20 +0000 (05:32 -0400)
commit1164bf7a1bbfa12a20920581d5bc835684321673
treebeaf7b08a09c35648358e86a81831c91fd1278de
parentb8596aadffde318b0f902f78bf16a8d342d6608d
parentcf9ef3a45b2cdd150ec77a811e3d4927c3bfbc85
Merge branch 'v3-0-test' of git://git.samba.org/samba into 3.0-test