Manual merge

diff --cc Makefile.am
index e07fe0a,7ed705c..8caca60
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -1,20 -1,6 +1,20 @@@
 +# Copyright (C) 2010 Richard Kettlewell
 +#
 +# This program is free software: you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation, either version 3 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
  sbin_PROGRAMS=trivial.fingerd
  trivial_fingerd_SOURCES=fingerd.c
- man_MANS=trivial.fingerd.8
+ dist_man_MANS=trivial.fingerd.8
  EXTRA_DIST=autogen.sh fingerd.plist.in
  
  # launchd config for OS X systems