Add myself to authors and contrib.committers.

Add my GPG key.
Remove myself from additional contributors.

Approved by: tabthorpe@ (mentor)

en_US.ISO8859-1/articles/contributors/contrib.additional.sgml

@@ -5121,11 +5121,6 @@
 	<email>der_julian@web.de</email></para>
     </listitem>
 
-    <listitem>
-      <para>Julien Laffaye
-	<email>kimelto@gmail.com</email></para>
-    </listitem>
-
     <listitem>
       <para>Jun Mukai
 	<email>mukai@jmuk.org</email></para>

en_US.ISO8859-1/articles/contributors/contrib.committers.sgml

@@ -810,6 +810,10 @@
       <para>&a.rene;</para>
     </listitem>
 
+    <listitem>
+      <para>&a.jlaffaye;</para>
+    </listitem>
+
     <listitem>
       <para>&a.clement;</para>
     </listitem>

en_US.ISO8859-1/share/sgml/authors.ent

@@ -554,6 +554,8 @@
 
 <!ENTITY a.jinmei "Tatuya JINMEI <email>jinmei@FreeBSD.org</email>">
 
+<!ENTITY a.jlaffaye "Julien Laffaye <email>jlaffaye@FreeBSD.org</email>">
+
 <!ENTITY a.jkh "Jordan K. Hubbard <email>jkh@FreeBSD.org</email>">
 
 <!ENTITY a.jkim "Jung-uk Kim <email>jkim@FreeBSD.org</email>">

share/pgpkeys/jlaffaye.key

@@ -0,0 +1,41 @@
+<!-- $FreeBSD$ -->
+<!--
+sh ./addkey.sh jlaffaye 6AEBE420;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   2048R/6AEBE420 2011-06-06
+      Key fingerprint = 031A B449 B383 5C3B B618  E2F4 BAD0 0F0E 6AEB E420
+uid                  Julien Laffaye <jlaffaye@FreeBSD.org>
+sub   2048R/538B8D5B 2011-06-06
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBE3sxXABCADDNxQCO8nHrTUJMV3tTT4Q1m9Cx0ZVeo1f/qUF3IMO346VYbQ7
+4ghzG7cwW2Ey8uGJmMl25p6CLIMG8eFPJHvtwCFa2CB8abab/WsfELNUOuMFyW8c
+HrnZp7B3I5YnlcIhm8RlP4labHTcU8mkjd9tlabmvWcXIIMKZO6IxSk43h8Btnol
+AUW8eyHi9so5ohwnGT/0OYskYlPKpBUAIXIOmaXmg08bdix/EjWtWRaHVWxdMIQl
+ZMseByIlSTGCSdEooZOFELfaPWOWFFQ0wTi/fiepDWB9WG8VvZH+1wcxotlCOVnZ
+jcpYeK2scPg4BabHtd/r2UxDsxMClZkg8LG/ABEBAAG0JUp1bGllbiBMYWZmYXll
+IDxqbGFmZmF5ZUBGcmVlQlNELm9yZz6JATgEEwECACIFAk3sxXACGwMGCwkIBwMC
+BhUIAgkKCwQWAgMBAh4BAheAAAoJELrQDw5q6+QgIl4IAMEHNmSxHv8XxeGDNWwJ
+iw6RirQOcm4WPpWGtvChlvZ8uTuZgPlqdSBQEGu7bSWTTK6zplOVmK4DYpUL2Hl3
+/2/SursUjkKO2QUkny7m/fT9qlJP+PAbXiqVa2naI55QvOuXNNx4zSusP8q7abbR
+bCtYHDeFE/DPNLI8GD/0Hmd8NWrPvHIwhGsK2ZzTuoGUV8q7zqgjlu7JB2JwH9dI
+tdMrVM2OgFLt3Mrb5F1C5J26nut/UVSkHPC1eW7mg8HnvCUK41HA1tKhkbXD8uMP
+7D3zgsuU35GHA5p9ARlETIauiVNsDzNgxWwU57BJ5hvGsmycF4M5i2/IOx/V5p2g
+yr25AQ0ETezFcAEIAMI/+5rGOIwZwC8qGny1upk8z/XxCReW3liTVOe+f1CaPOIh
+nLTpyD7+Mxts64IDO2tYQWZTw98yayGP8xCRKjBkgjOIgX/SInoAc5YAUMWMOtl4
+3kGqR+RboQWKKq83VPNGRnwTXu3RMlonyt5T2RV86lgIbDSabaAUnLjWDpgP7POI
+/IrpKLSJp21TXHMGobpxeLcXqPApRdKgJL9bP3+jLqbKJmLzhgwzjxpIosAWqRkb
+PJdZejCfdC8mU1DpKCDUQRLVD0Sbh69jsSiepSh6BIn+lDpfRH1nLoGAhomG6kwC
+pG4hCXAB6V2EvF0EBQmDMmORlDJFejDpHEbXxlEAEQEAAYkBHgQYAQIACQUCTezF
+cAIbDAAKCRC60A8OauvkIN0qB/iBrnK5dmFQ4aGQesa+2myOCMgiszggnbzXDFA/
+eky/jkIQiAr2xUAwQZz3iPrwzSpopCcPXKHnN7gsfRBUZ7ns2JmJWmyU4gxadbFl
+kMvB+i24Cav9/ucE8r0wyJKcquI3PiS4qpUzDEdNG/k+B9/Z4oqKRCcxrjSrwnuy
+iNFiIUl3AQvTgHQBpZGl9DA9zdAM+iPbm7zFwQBCpFeysEOv4bCAfHFuRGJ4xKyq
+tM+aBqAYzEWQTj+WBz+zYBHOY8VOn42fwBRWeR8+Ml0BxebrNh/uJZOjJp/IBZbc
+39ZjPt8SvaBUTAfKGXPZ9O2NSNEExRAKFQ01NDQfN8xxH/Y=
+=QYhu
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>

share/pgpkeys/pgpkeys-developers.sgml

@@ -761,6 +761,11 @@
       &pgpkey.rene;
     </sect2>
 
+    <sect2 id="pgpkey-jlaffaye">
+      <title>&a.jlaffaye;</title>
+      &pgpkey.jlaffaye;
+    </sect2>
+
     <sect2 id="pgpkey-clement">
       <title>&a.clement;</title>
       &pgpkey.clement;

share/pgpkeys/pgpkeys.ent

@@ -154,6 +154,7 @@
 <!ENTITY pgpkey.jkim SYSTEM "jkim.key">
 <!ENTITY pgpkey.jkois SYSTEM "jkois.key">
 <!ENTITY pgpkey.jkoshy SYSTEM "jkoshy.key">
+<!ENTITY pgpkey.jlaffaye SYSTEM "jlaffaye.key">
 <!ENTITY pgpkey.jmb SYSTEM "jmb.key">
 <!ENTITY pgpkey.jmelo SYSTEM "jmelo.key">
 <!ENTITY pgpkey.jmg SYSTEM "jmg.key">