CVS: ----------------------------------------------------------------------
CVS: Please format log message lines to be no longer than the above line.
