merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Tue, 17 Apr 2007 01:54:19 +0000 (11:54 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 17 Apr 2007 01:54:19 +0000 (11:54 +1000)
commitd854392b04c46bcdd008cced5d16a03d81f97bd0
treed67a050f0c3d535c4886c3de2e42914522cbfac9
parentfcf3669c27691ddb383d1c585234622efa498d90
parentedf1e1fea8500461a08cd2795251a5cc0bd10229
merge from ronnie