0c961f7f98
between directory trees and for merging changes from one tree into another. Obtained from: Paul Mackerras <paulus@samba.org>