merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Thu, 18 Oct 2007 05:51:15 +0000 (15:51 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 18 Oct 2007 05:51:15 +0000 (15:51 +1000)
commita6b094fdede0ae850e87877fad0b9dd1f3a26869
treea0b373bb187236163e1d3960f98c5691dc01f799
parent75d4b386293e186a6bb8532515585ab72670d663
parent221432f45073bc7624803058c8bbf18838e7ceeb
merge from ronnie