[Bug 226552] Merge Review: xdelta