Merge from trunkpending

1 files changed, 2 insertions, 3 deletions

diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index e09ddd62b97..2ad5acadcb0 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -1,6 +1,6 @@
 /* Allocate X colors.  Used for testing with dense colormaps.
 
-Copyright (C) 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -40,7 +40,7 @@ void
 usage (const char *progname)
 {
   fprintf (stderr, "Usage %s options\n", progname);
-  fprintf (stderr, "-n NCOLORS  allcoate NCOLORS colors\n");
+  fprintf (stderr, "-n NCOLORS  allocate NCOLORS colors\n");
   exit (1);
 }
 
@@ -111,4 +111,3 @@ main (int argc, char **argv)
   XCloseDisplay (dpy);
   return 0;
 }
-