X11 R6.4 patchlevel 3, stuffed into a git repo to make it easier for me
to track my own patches.  At the moment, the patches I had prior to
this are a single omnibus commit; I hope to, eventually, break them out
into well-separated changesets.  If I do, I will have to think about
how to represent the result in a not-too-git-unfriendly way....