Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 285-296)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: admin/FOR-RELEASE: Update refcard section.

 * gnus--rel--5.10  (patch 102-104)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64

1 files changed, 19 insertions, 0 deletions

diff --git a/etc/ulimit.hack b/etc/ulimit.hack
index 17105158c42..d804459ba0b 100644
--- a/etc/ulimit.hack
+++ b/etc/ulimit.hack
@@ -37,4 +37,23 @@ exit 0
 #
 # Upon system reboot, all processes will inherit the new large ulimit.
 
+# Copyright (c) 1999, 2003, 2006
+# Free Software Foundation, Inc.
+
+# COPYING PERMISSIONS:
+#
+#   This document is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 # arch-tag: 6f9a7072-9d07-4431-b0bb-e867648ad0b4