Migrate cvs diff from fptools-assoc branch