Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Wed, 30 Jan 2008 22:49:15 +0000 (09:49 +1100)
committerAndrew Tridgell <tridge@samba.org>
Wed, 30 Jan 2008 22:49:15 +0000 (09:49 +1100)
commit8398982ac998d98cb1184f2b6d2631f1cfc9b3f8
treed930f888211ce6f1353b4b41f2b1563957933e2b
parent3a3ff8ebe7b7de24a7d3e2c9dd105d9fbeeb5d42
parent1c22c925e5a7f45fbcbf9c2f8e206ee6b2b12192
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit f6a5848e5e211d4d4d66b7eca46b4b0ad4c9daab)