* merged from apt--auto-mark