Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 8 Apr 2008 07:31:36 +0000 (17:31 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 8 Apr 2008 07:31:36 +0000 (17:31 +1000)
commit0e59c73fe3a5cde76881294f17bf6ca9258f67a1
tree6007f25ac8af86370db09dfaaa138c618eb08ac0
parentb2805c50eecddfa4cbd0945e713567eddce05895
parent1f474f4a545752f7ac0ad402d01d1e768b973dbe
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit c0416a0b73f06ef57db1b83a75433e36b93a9981)