roughly edited up to end of "upgrade salix to 14.1"