Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 16 Apr 2008 15:35:32 +0000 (17:35 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 16 Apr 2008 15:35:32 +0000 (17:35 +0200)
commiteab5f6a7f5efa8608cb23af2cab8ab19f9f62485
tree7701eee01433df7b255bdd3fd7c4e0f1708ac99c
parent29d5de9e8fb69346e29a95c6fcaefabd018c9447
parent356a5d24747bb5e1ef9774c690a5ec386a4a165e
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet