Original commit message from CVS: yikes, cvs didn't like my vim swap file. here's the proper revert + commit