this weekend in order to more easily sync with my CVS tree at home. Another commit relative to these changes will follow shortly.