add pem2openpgp to make install target

add link to pem2openpgp in openpgp2ssh man page
Merge commit 'micah/master'

Conflicts:

	doc/george/changelog

diff --cc Makefile
index e40c4b18366bb374b690921707d6f9dcda8fc885,7493b1f5112924e38f92e20094967ff6e8d41234..8d9ab2f1bb0dc33a2b769fc6794662ae6070e00a
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -50,7 -49,7 +50,7 @@@ install: all installma
        mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin $(DESTDIR)$(PREFIX)/share/monkeysphere
        mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
        mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
--      install src/monkeysphere src/monkeysphere-ssh-proxycommand src/keytrans/openpgp2ssh $(DESTDIR)$(PREFIX)/bin
++      install src/monkeysphere src/monkeysphere-ssh-proxycommand src/keytrans/openpgp2ssh src/keytrans/pem2openpgp $(DESTDIR)$(PREFIX)/bin
        install src/monkeysphere-server $(DESTDIR)$(PREFIX)/sbin
        install -m 0644 src/common $(DESTDIR)$(PREFIX)/share/monkeysphere
        install doc/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere

diff --cc doc/george/changelog
Simple merge

diff --cc man/man1/openpgp2ssh.1
index 89df0473fd31200c53a8694d563acd76d71edc2d,89df0473fd31200c53a8694d563acd76d71edc2d..8374a9f7858765bbfd139b89039857fb08f360a8
--- 1/man/man1/openpgp2ssh.1
--- 2/man/man1/openpgp2ssh.1
+++ b/man/man1/openpgp2ssh.1
@@@ -90,6 -90,6 +90,7 @@@ only acts on keys associated with the f
  passed in.  If you send it more than one primary key, it will silently
  ignore later ones.
  .Sh SEE ALSO
++.Xr pem2openpgp 1 ,
  .Xr monkeysphere 1 ,
  .Xr monkeysphere 7 ,
  .Xr ssh 1 ,