merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Mon, 27 Aug 2007 08:04:53 +0000 (18:04 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 27 Aug 2007 08:04:53 +0000 (18:04 +1000)
commitab11fd70cf4d2165a5b55930cbad6fddf5397f54
tree71263e2a48a4c2f45bc174d4ba9799f86f06bb3d
parent55b415f87bd3cba13c73ccd2fe661720754a6af7
parenta9c1be9cf9efdc69bfc95657b70e9f8b8230cda8
merge from ronnie