merge from head
commit6f772af7b9a830e9598d3c11b4eb0d4148774cd2
authorAndrew Tridgell <tridge@samba.org>
Wed, 25 Apr 2001 06:46:17 +0000 (25 06:46 +0000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 25 Apr 2001 06:46:17 +0000 (25 06:46 +0000)
treec8245618088c7994465d6a23d56a7919de258327
parent1ac2392ff104cf8443c23253d5af5b4141ded746
merge from head