Merge proposals dependent on lp://staging/~yadi/squid/makefile-deps

lp://staging/~yadi/squid/makefile-deps has no merge proposals.