Merge from emacs--rel--22

[gnu-emacs] / lib-src / getopt.c

diff --git a/lib-src/getopt.c b/lib-src/getopt.c
index 70fd418626180e4255dcc42ff0c8384798b3fb0a..587c2e0f618f37c4b39ada633ea3fd658b3fff8c 100644 (file)
--- a/lib-src/getopt.c
+++ b/lib-src/getopt.c
@@ -4,12 +4,12 @@
    before changing it!
    Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
                  1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003,
    before changing it!
    Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
                  1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003,

-                2004, 2005 Free Software Foundation, Inc.
+                2004, 2005, 2006, 2007 Free Software Foundation, Inc.

    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    This file is part of the GNU C Library.
 
    This program 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, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    This program is distributed in the hope that it will be useful,
    any later version.
 
    This program is distributed in the hope that it will be useful,