Undo cherry-pick errors.

Cherry-picking the previous change from the trunk picked up two entries
that should be in the trunk but not in the 4.1 branch.  Remove them.

diff --git a/CREDITS b/CREDITS
index 86969d01f046e737849acee55bbb3effa318bd30..727acd482fcfc99ae7be4fffdb37302fd5b25082 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -22,7 +22,6 @@ Additional people who have contributed patches:
     Andrew Silent                 <andrew at nording dot ru>
     Andrew Tridgell               <tridge at linuxcare dot com>
     Andy Heffernan                <ahh at juniper dot net>
     Andrew Silent                 <andrew at nording dot ru>
     Andrew Tridgell               <tridge at linuxcare dot com>
     Andy Heffernan                <ahh at juniper dot net>

-    Anton Bernal                  <anton at juniper dot net>

     Arkadiusz Miskiewicz          <misiek at pld dot org dot pl>
     Armando L. Caro Jr.           <acaro at mail dot eecis dot udel dot edu>
     Arnaldo Carvalho de Melo      <acme at ghostprotocols dot net>
     Arkadiusz Miskiewicz          <misiek at pld dot org dot pl>
     Armando L. Caro Jr.           <acaro at mail dot eecis dot udel dot edu>
     Arnaldo Carvalho de Melo      <acme at ghostprotocols dot net>


@@ -51,7 +50,6 @@ Additional people who have contributed patches:
     David Horn                    <dhorn2000 at gmail dot com>
     David Smith                   <dsmith at redhat dot com>
     David Young                   <dyoung at ojctech dot com>
     David Horn                    <dhorn2000 at gmail dot com>
     David Smith                   <dsmith at redhat dot com>
     David Young                   <dyoung at ojctech dot com>

-    Dmitry Eremin-Solenikov       <dbaryshkov at gmail dot com>

     Don Ebright                   <Don dot Ebright at compuware dot com>
     Eddie Kohler                  <xexd at sourceforge dot net>
     Elmar Kirchner                <elmar at juniper dot net>
     Don Ebright                   <Don dot Ebright at compuware dot com>
     Eddie Kohler                  <xexd at sourceforge dot net>
     Elmar Kirchner                <elmar at juniper dot net>