# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1226977254 0
# Node ID 16f58b7418c0ad9c4985f39b16277f1011482020
# Parent  e2f5a4a091b5aea06fa8de7c971a179f35648a85# Parent  798413cd4c17a2fed0488a5d68a7cd0e35695905
merge of '9ffac1a19695cb6a4ed024bc6951cae029d6daaf'
     and 'd8c371c48ca198c45ed71c86837ddef903d9f617'

diff -r e2f5a4a091b5 -r 16f58b7418c0 COPYRIGHT
--- a/COPYRIGHT	Tue Nov 18 02:00:48 2008 +0000
+++ b/COPYRIGHT	Tue Nov 18 03:00:54 2008 +0000
@@ -478,6 +478,7 @@
 Jared Yanovich
 Timmy Yee
 Nickolai Zeldovich
+Tom Zickel
 Marco Ziech
 Piotr Zielinski
 Jeroen Zwartepoorte