merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Sun, 3 Jun 2007 04:41:28 +0000 (14:41 +1000)
committerAndrew Tridgell <tridge@samba.org>
Sun, 3 Jun 2007 04:41:28 +0000 (14:41 +1000)
commit3d3b2eac028dc7d54e7ef0987a5f4063c4dcbe5a
tree08636a780a670c11db966ef8a9ba2571e96361a4
parente0468d61119b6581f5ec458641568d03714a5786
parent7e51fdd07760bba894578d8e07873894340eb981
merge from ronnie