Merge from emacs-23

[gnu-emacs] / etc / MACHINES

diff --git a/etc/MACHINES b/etc/MACHINES
index ebefc8905e074ea70f6eb24b9b9ea294a1fb2b09..6fa0e533369cd036bb8e2e58ef37c10e953906bf 100644 (file)
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -1,7 +1,7 @@
 Emacs machines list
 
 Copyright (C) 1989, 1990, 1992, 1993, 1998, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 This is a list of the status of GNU Emacs on various machines and systems.