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