merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Wed, 22 Aug 2007 07:31:29 +0000 (17:31 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 22 Aug 2007 07:31:29 +0000 (17:31 +1000)
commite0f1c1acb1188500674626d631e1a1b8726e72ad
tree52ba6f69235041439736e12618b0d8c45b9b9b83
parenta5587b3c065f7115ad5e55429c2c9d9923d3b4dc
parent79eb0863609fbb12e28ebf734101b1d3f359b330
merge from ronnie