Merge in J.Layton patch and resolve conflict.
[samba.git] / Read-Manifest-Now