sha, Minor adjustments to Xdefaults for xterm.
sha, Merging