Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Tue, 12 Feb 2008 01:56:30 +0000 (12:56 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 12 Feb 2008 01:56:30 +0000 (12:56 +1100)
commitf7bcc15bf8acc157dde8a9895773a0dd03ca6cfb
tree0bf64d4b2b2183183062392c3f7fd713134af575
parentccc27e681cbd6283513b929d58f2ebce35e6658b
parente84cd8d38bcb6756c5066c7c75f3220a15e5ad1b
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 3beaa04ef73ca21925d41745b30b6bbaadb7b939)