--- a/CONTRIBUTORS Wed Nov 07 18:26:59 2007 -0800
+++ b/CONTRIBUTORS Wed Nov 07 21:13:56 2007 -0600
@@ -1,4 +1,7 @@
-Andrea Arcangeli <andrea at suse.de>
+[This file is here for historical purposes, all recent contributors
+should appear in the changelog directly]
+
+Andrea Arcangeli <andrea at suse.de>
Thomas Arendsen Hein <thomas at intevation.de>
Goffredo Baroncelli <kreijack at libero.it>
Muli Ben-Yehuda <mulix at mulix.org>
@@ -36,5 +39,3 @@
Rafael Villar Burke <pachi at mmn-arquitectos.com>
Tristan Wibberley <tristan at wibberley.org>
Mark Williamson <mark.williamson at cl.cam.ac.uk>
-
-If you are a contributor and don't see your name here, please let me know.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-merge-types.out Wed Nov 07 21:13:56 2007 -0600
@@ -0,0 +1,1 @@
+### This test is for a known, unfixed bug ###