Synchronization changes in cvs HEAD

A bunch of major changes has just been committed into HEAD. This message
is intended to explain the details.