From owner-freebsd-commit  Fri Sep 15 15:16:59 1995
Return-Path: owner-commit
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id PAA11507
          for freebsd-commit-outgoing; Fri, 15 Sep 1995 15:16:59 -0700
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id PAA11482
          for cvs-all-outgoing; Fri, 15 Sep 1995 15:16:49 -0700
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id PAA11468
          for cvs-etc-outgoing; Fri, 15 Sep 1995 15:16:45 -0700
Received: (from gibbs@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id PAA11428
          ; Fri, 15 Sep 1995 15:16:27 -0700
Date: Fri, 15 Sep 1995 15:16:27 -0700
From: "Justin T. Gibbs" <gibbs>
Message-Id: <199509152216.PAA11428@freefall.freebsd.org>
To: CVS-commiters, cvs-etc
Subject: cvs commit: src/etc inetd.conf services
Sender: owner-commit@FreeBSD.org
Precedence: bulk

gibbs       95/09/15 15:16:24

  Branch:      etc       RELENG_2_1_0
  Modified:    etc       inetd.conf services
  Log:
  Merge with HEAD.  Brings in rkinit and krb_prop entries plus some additional
  "PROBLEMS" comments in services that warn about overlapping entries.