Merge branch 'merges'
[sxemacs] / src / s / sunos4-1-3-shr.h
2010-11-04 Steve YoungsInitial git import v22.1.13