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)
commitc0416a0b73f06ef57db1b83a75433e36b93a9981
treece0d00101ab5f466c9046d06b0fa609200287894
parent42393c830733b2cc99ebccdafe944fcf3d82734f
parentb6b7171f70114bd27ca8db09964c65cacb9cea92
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet