merge from jim
authorAndrew Tridgell <tridge@samba.org>
Tue, 29 May 2007 04:46:29 +0000 (14:46 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 29 May 2007 04:46:29 +0000 (14:46 +1000)
commita41acd1835af91176a2de1c251a8709dc42b65ac
tree5abfb68233e47eafb90c917ccae1e1fdb2094e5f
parent2f6eae476203f8a8b28e083553204c01f224c8a5
parent6695ec4845b71135db3fc5ed76afde7f20d8e24e
merge from jim