[SCM] debian-live/live-helper branch, master, updated. 1.0_a40-1-18-gd4a35b7

[Daniel Baumann]

The following commit has been merged in the master branch:
commit d4a35b70875f47852a18989fce1077bb8acbabf4
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Mar 25 09:11:47 2008 +0100

    Updating credits.

diff --git a/docs/AUTHORS b/docs/AUTHORS
index 908a12e..b43ea38 100644
--- a/docs/AUTHORS
+++ b/docs/AUTHORS
@@ -1,3 +1,8 @@
-Main Authors:
+Main Author:
 
   * Daniel Baumann <daniel at debian.org>
+
+Main Contributors:
+
+  * Otavio Salvador <otavio at debian.org>
+  * Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/docs/CREDITS b/docs/CREDITS
index acf3b4f..a38aaef 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -1,26 +1,41 @@
 Patches (alphabetical order):
 
   * Alex Owen <r.a.owen at qmul.ac.uk>
+  * An-Cheng Huang <ancheng at vyatta.com>
+  * Antonio Amorim <Antonio.Amorim at sim.fc.ul.pt>
   * Bas Wijnen <wijnen at debian.org>
   * Ben Armstrong <synrg at debian.org>
   * Cedric Lucantis <omer at no-log.org>
+  * Chris Lamb <chris at chris-lamb.co.uk>
+  * Cyril Brulebois <cyril.brulebois at kerlabs.com>
+  * David Madore <david.madore at ens.fr>
+  * Fathi Boudra <fabo at debian.org>
+  * Franklin Piat <fpiat at bigfoot.com>
   * Frederic Lehobey <Frederic.Lehobey at free.fr>
   * Guerkan Senguen <gurkan at linuks.mine.nu>
   * Hadar Weiss <whadar at gmail.com>
   * Inigo Tejedor Arrondo <inigo at navarrux.org>
   * Jason D. Clinton <me at jasonclinton.com>
-  * Kai Hendry <hendry at iki.fi>
+  * Jean Pierre LeJacq <jp.lejacq at quoininc.com>
+  * Jesse Hathaway <jesse at mbuki-mvuki.org>
+  * Justin Pryzby <pryzbyj at justinpryzby.com>
+  * Kai Hendry <hendry at webconverger.com>
+  * Kel Modderman <kel at otaku42.de>
+  * Maarten ter Huurne <maarten at treewalker.org>
   * Marcelo D. Re <mdre at rectorado.unl.edu.ar>
   * Marco Amadori <marco.amadori at gmail.com>
   * Markus Bauer <bauer-markus at web.de>
   * Mathieu Geli <mathieu.geli at gmail.com>
   * Otavio Salvador <otavio at debian.org>
+  * Peter Holik <peter at holik.at>
+  * Peter Skogstroem <peter.skogstrom at bitrunner.com>
   * Rene Merou <ochominutosdearco at gmail.com>
   * Richard Nelson <rjent at rjent.pair.com>
   * Scott Edwards <debian at foss.daxal.com>
   * Sebastian Raveau <sebastien.raveau at epita.fr>
   * Thomas Lange <lange at informatik.uni-koeln.de>
   * Trent Buck <trentbuck at gmail.com>
+  * Tzafrir Cohen <tzafrir.cohen at xorcom.com>
   * Vladimir Stavrinov <vs at inist.ru>
 
 Donations (alphabetical order):

-- 
debian-live/live-helper