merged from ronnie
authorAndrew Tridgell <tridge@samba.org>
Sun, 3 Jun 2007 10:54:24 +0000 (20:54 +1000)
committerAndrew Tridgell <tridge@samba.org>
Sun, 3 Jun 2007 10:54:24 +0000 (20:54 +1000)
commit02b7781c29c2a63d236bd38b3a19af2af8e57a72
treefefcc046e49f1e44d61c6f8f4b18410625c366fd
parent83a1c79e95af93a9ccfe78556ac5692c0315a3e4
parent1aa6a632ec59d854fc5579fedad0d66b1b46ae8c
merged from ronnie