Merge GDB 7.5.1

gdb/gnulib/import/extra/snippet/arg-nonnull.h

Index: gdb/gnulib/import/extra/snippet/arg-nonnull.h
diff --git a/gdb/gnulib/extra/arg-nonnull.h b/gdb/gnulib/import/extra/snippet/arg-nonnull.h
similarity index 90%
rename from gdb/gnulib/extra/arg-nonnull.h
rename to gdb/gnulib/import/extra/snippet/arg-nonnull.h
index cf4989699d073ea280b9a38cccfb3e8801ea3e9b..3a9dd2664eab4cda92fda7d2cc148350f85cc443 100644
--- a/gdb/gnulib/extra/arg-nonnull.h
+++ b/gdb/gnulib/import/extra/snippet/arg-nonnull.h
@@ -1,5 +1,5 @@
 /* A C macro for declaring that specific arguments must not be NULL.
-   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -9,7 +9,7 @@
    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
-   Lesser General Public License for more details.
+   General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */