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)
commit3beaa04ef73ca21925d41745b30b6bbaadb7b939
tree7f32cbef4472f75812432d9e2ff8bd5d7c24d795
parent55af8acc7b32c24e4b1187e9d8d1c8f060e914b0
parentab19a8f62719eb0f347696a2e5f34f8847fd82cb
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test