merged from Peter
authorAndrew Tridgell <tridge@samba.org>
Mon, 4 Dec 2006 21:06:15 +0000 (08:06 +1100)
committerAndrew Tridgell <tridge@samba.org>
Mon, 4 Dec 2006 21:06:15 +0000 (08:06 +1100)
commit0f7ff0eb31d6a82be40e21b811abb85981f4cfd5
treeea72b82b76b0c79b11a1375a8a8ca0e31e83f7fe
parent8b3f9c901ad4b1485eb4b514da8466a0b50ef726
parentabc571a9948b51a436bacaae89b49b8a0e08a093
merged from Peter