Merge between my version and Jim Fulton's version; removed RCS keywords
but otherwise unchanged.
1 file changed