Original commit message from CVS: Merge HEAD from CAPS-ROOT to CAPS-MERGE-3, plus some caps conversion