merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Mon, 29 Oct 2007 02:43:12 +0000 (13:43 +1100)
committerAndrew Tridgell <tridge@samba.org>
Mon, 29 Oct 2007 02:43:12 +0000 (13:43 +1100)
commit22b110549ff35f2560043abd5d85bed4b35295ee
tree8b5dc94b0b6254f4757b77de242644c2834455e8
parent4780e078fb55d69053f78a4bbc7c67e569bb5dae
parentc30d5c328784059949f5e82a07008e9632234f20
merge from ronnie