merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Tue, 4 Dec 2007 04:20:40 +0000 (15:20 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 4 Dec 2007 04:20:40 +0000 (15:20 +1100)
commit072ef744951d3aa59dd8be70578b99b18c37d988
treeeecbacd9f297648c1db5d55aae2314370c0e396c
parente7d077e98a40a62dbd6bfd174f29afba7b5529ef
parent880dd9f5fd0b91e450da93e195cc5c62cb1dcd6e
merge from ronnie