merged changes from peter
authorAndrew Tridgell <tridge@samba.org>
Thu, 8 Mar 2007 00:27:15 +0000 (11:27 +1100)
committerAndrew Tridgell <tridge@samba.org>
Thu, 8 Mar 2007 00:27:15 +0000 (11:27 +1100)
commitda81d849be32427b0e13fc8b45e01c5015a35b29
tree9cac5b71993674f9c1bba471ee292b5005f66eae
parentfa76cff388237adea98c2be0827c54334080256a
parent49cac6eafb9d9c80ef1c7f0388aa7786c8be6f24
merged changes from peter