merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Fri, 3 Aug 2007 03:18:44 +0000 (13:18 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 3 Aug 2007 03:18:44 +0000 (13:18 +1000)
commite2f11745df88d22e98fc5d5e1ca69acac13f1423
tree236cac57281fb8c046b4dee935fe3b6f26a2bb3c
parent4a61132e2a4f6beca8e9148307c7ec16cb74bb08
parentbda310b74d6364bf88032874a1f3a2fb156f9736
merge from ronnie