From 9ba4f54b268216864863c63049ba60b549dfbbbf Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fdinitto@redhat.com>
Date: Tue, 1 Mar 2011 14:12:23 +0100
Subject: [PATCH] Merge Author files

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 AUTHORS       | 30 ++++++++++++++++++++++++++++++
 doc/COPYRIGHT | 33 ---------------------------------
 2 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 77d0f4de14..ee0169a627 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,29 +1,59 @@
 Authors:  
 --------  
+A. J. Lewis <alewis at redhat.com>
+Abhijith Das <adas at redhat.com>
+Adam Manthei <amanthei at redhat.com>
 Akamatsu Hiroshi <akamatsu.hiroshi@yes.nttcom.ne.jp>
 Alan Robertson <alanr@unix.sh>
+Alasdair G. Kergon <agk at redhat.com>
 Andrew Beekhof <andrew@beekhof.net>  
+Andrew Price <andy at andrewprice.me.uk>
+Benjamin Marzinski <bmarzins at redhat.com>
+Bob Peterson <rpeterso at redhat.com>
+Chris Feist <cfeist at redhat.com>
 Christian Rishoj <christian@rishoj.net>
+Christine Caulfield <ccaulfie at redhat.com>
 Daiki Matsuda <d.matuda@gmail.com>
+Daniel Phillips <phillips at redhat.com>
 David Lee <t.d.lee@durham.ac.uk>
+David Teigland <teigland at redhat.com>
 Dejan Muhamedagic <dejan@hello-penguin.com>
 Dominik Klein <dk@in-telegence.net>
+Fabio M. Di Nitto <fdinitto at redhat.com>
 Florian Haas <florian@linbit.com>
 Hideo Yamauchi <renayama19661014@ybb.ne.jp>
 Horms <horms@verge.net.au>
 Huang Zhen <zhen.huang@gmail.com>
+James Parsons <jparsons at redhat.com>
 Jean-Francois Larvoire <jf.larvoire@hp.com>
+Joel Becker <joel.becker at oracle.com>
+Jonathan Brassow <jbrassow at redhat.com>
 Keisuke MORI <kskmori@intellilink.co.jp>
+Ken Preslan <kpreslan at redhat.com>
 Lars Marowsky-Bree <lmb@suse.de>
+Lon Hohberger <lhh at redhat.com>
+Marc - A. Dahlhaus <mad at wol.de>
+Marek 'marx' Grac <mgrac at redhat.com>
+Mark Hlawatschek <hlawatschek at atix.de>
 Matthew Soffen
+Michael Conrad Tadpol Tilstra <mtilstra at redhat.com>
 Michael Schwartzkopff <misch@multinet.de>
 Nakahira Kazutomo <nakahira@intellilink.co.jp>
+Patrick Caulfield <pcaulfie at redhat.com>
 Philipp Kolmann <philipp@kolmann.at>
 Raoul Bhatia <r.bhatia@ipax.at>
+Robert Peterson <rpeterso at redhat.com>
 Ron Terry <rterry@novell.com>
+Ross Vandegrift <ross at kallisti.us>
+Ryan McCabe <rmccabe at redhat.com>
+Ryan O'Hara <rohara at redhat.com>
 Sebastian Reitenbach <itlistuser@rapideye.de>
 Serge Dubrouski <sergeyfd@gmail.com>
 Simon Horman <horms@verge.net.au>
+Stanko Kupcevic <kupcevic at redhat.com>
 Stephan Berlet <SBerlet@sysdesign-edv.de>
+Steven Whitehouse <swhiteho at redhat.com>
 Takenaka Kazuhiro <takenaka.kazuhiro@oss.ntt.co.jp>
+Wendy Cheng <wcheng at redhat.com>
 Xinwei Hu <hxinwei@gmail.com>
+jparsons <jparsons at redhat.com>
diff --git a/doc/COPYRIGHT b/doc/COPYRIGHT
index 364f0872f9..25c2446e24 100644
--- a/doc/COPYRIGHT
+++ b/doc/COPYRIGHT
@@ -63,36 +63,3 @@ rgmanager/src/resources/smb.sh:
  Author(s):
   Lon Hohberger (lhh at redhat.com)
   Tim Burke (tburke at redhat.com)
-
-Authors as known by current RCS as of the time of writing:
-
-Abhijith Das <adas at redhat.com>
-Adam Manthei <amanthei at redhat.com>
-A. J. Lewis <alewis at redhat.com>
-Alasdair G. Kergon <agk at redhat.com>
-Andrew Price <andy at andrewprice.me.uk>
-Benjamin Marzinski <bmarzins at redhat.com>
-Bob Peterson <rpeterso at redhat.com>
-Chris Feist <cfeist at redhat.com>
-Christine Caulfield <ccaulfie at redhat.com>
-Daniel Phillips <phillips at redhat.com>
-David Teigland <teigland at redhat.com>
-Fabio M. Di Nitto <fdinitto at redhat.com>
-James Parsons <jparsons at redhat.com>
-Joel Becker <joel.becker at oracle.com>
-Jonathan Brassow <jbrassow at redhat.com>
-jparsons <jparsons at redhat.com>
-Ken Preslan <kpreslan at redhat.com>
-Lon Hohberger <lhh at redhat.com>
-Marc - A. Dahlhaus <mad at wol.de>
-Marek 'marx' Grac <mgrac at redhat.com>
-Mark Hlawatschek <hlawatschek at atix.de>
-Michael Conrad Tadpol Tilstra <mtilstra at redhat.com>
-Patrick Caulfield <pcaulfie at redhat.com>
-Robert Peterson <rpeterso at redhat.com>
-Ross Vandegrift <ross at kallisti.us>
-Ryan McCabe <rmccabe at redhat.com>
-Ryan O'Hara <rohara at redhat.com>
-Stanko Kupcevic <kupcevic at redhat.com>
-Steven Whitehouse <swhiteho at redhat.com>
-Wendy Cheng <wcheng at redhat.com>