>From CVS log: Merge of rssa branch. Contents of repository just before merge were tagged pre-rssa-merge.