merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Thu, 17 Jan 2008 05:46:56 +0000 (16:46 +1100)
committerAndrew Tridgell <tridge@samba.org>
Thu, 17 Jan 2008 05:46:56 +0000 (16:46 +1100)
commit5f6d59b9d18c694d82591238bc7a6bb98726a3ed
tree3a91fa89a6a7e2b998bbddc4e2d3f075758aeb5b
parentfc3733f8e966376f50799fd1aa7b0a8e1cf66e0e
parentb86e8ccbdac044bb949c4fc2ebb27635126272a9
parent4c7153681ed4d68d601720d043f9ff95ac7647a9
merge from ronnie