Merge branch 'master' into robustify

Signed-off-by: Richard Fontana <rfontana@redhat.com>
Signed-off-by: Mark Wielaard <mjw@redhat.com>

diff --cc libdwfl/ChangeLog
Simple merge

diff --cc libdwfl/relocate.c
index c7a92ef06a377a7f08817daa2eba48300e0ab33b,2c24bd5a982903536a1d21d08057a393497937c4..70eacc863f3849c3516b3cc7d77b75b945588d90
--- 1/libdwfl/relocate.c
--- 2/libdwfl/relocate.c
+++ b/libdwfl/relocate.c
@@@ -1,12 -1,23 +1,23 @@@
  /* Relocate debug information.
 -   Copyright (C) 2005-2010 Red Hat, Inc.
 +   Copyright (C) 2005-2011 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/ChangeLog
Simple merge

diff --cc libelf/elf32_getphdr.c
Simple merge

diff --cc libelf/elf32_getshdr.c
index 0a1e58cbf0d46212f6afc41996ccfebd7cd479df,f0319cbb9e432fd8fd47dbad9735535de627a28e..7e2b0ddcd5c523c95f8f69ae248d0cdf6a0f9eed
--- 1/libelf/elf32_getshdr.c
--- 2/libelf/elf32_getshdr.c
+++ b/libelf/elf32_getshdr.c
@@@ -1,13 -1,24 +1,24 @@@
  /* Return section header.
 -   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2007, 2009 Red Hat, Inc.
 +   Copyright (C) 1998-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 1998.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/elf32_newphdr.c
Simple merge

diff --cc libelf/elf32_updatefile.c
Simple merge

diff --cc libelf/elf_begin.c
Simple merge

diff --cc libelf/elf_getarsym.c
Simple merge

diff --cc libelf/elf_getshdrstrndx.c
Simple merge

diff --cc libelf/elf_newscn.c
Simple merge

diff --cc libelf/gelf_getdyn.c
index 195d2e0a5e8e92d15b98801f7320a9621bd0bf3f,721af62284dc69bb41ac440783ea5844f1e7e0cb..98038a3820e495ed82a837f23fb3c4d282f1152a
--- 1/libelf/gelf_getdyn.c
--- 2/libelf/gelf_getdyn.c
+++ b/libelf/gelf_getdyn.c
@@@ -1,13 -1,24 +1,24 @@@
  /* Get information from dynamic table at the given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
 +   Copyright (C) 2000-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2000.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/gelf_getlib.c
index 3a110f8f92d26b36b4e36fdc3ceaffdfc363d5e6,9a8a17491812b9bbdb93b3f2313931739507d2f3..e2cdcf301ce274d9828be9585eb013d5637ff2d6
--- 1/libelf/gelf_getlib.c
--- 2/libelf/gelf_getlib.c
+++ b/libelf/gelf_getlib.c
@@@ -1,13 -1,24 +1,24 @@@
  /* Get library from table at the given index.
 -   Copyright (C) 2004 Red Hat, Inc.
 +   Copyright (C) 2004-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2004.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/gelf_getmove.c
index db36e9d5ebd29b7e72c62afdf823fc21ac0c117f,95669303c3dfb80d842ae86e2b834c06bb840130..fea7586f60c5855f79573ea4dde90ab987a6ff60
--- 1/libelf/gelf_getmove.c
--- 2/libelf/gelf_getmove.c
+++ b/libelf/gelf_getmove.c
@@@ -1,13 -1,24 +1,24 @@@
  /* Get move structure at the given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
 +   Copyright (C) 2000-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2000.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/gelf_getrel.c
index bc90e60b13f16e8fd216457213e2dc6af3aba1d2,78394b425533519942de4490aa5b808ce2e4f68f..e489a8c11b3aa43246c4f1aa7df209c1097f3e95
--- 1/libelf/gelf_getrel.c
--- 2/libelf/gelf_getrel.c
+++ b/libelf/gelf_getrel.c
@@@ -1,13 -1,24 +1,24 @@@
  /* Get REL relocation information at given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
 +   Copyright (C) 2000-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2000.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/gelf_getrela.c
index 40da4e66c047c88d919f773a41cca6ba1a512da6,1d0e7eee2da669492d53f41bddb1936fe55f2338..aae8c2bebf167ffad6a59429aac12bb72e4ab131
--- 1/libelf/gelf_getrela.c
--- 2/libelf/gelf_getrela.c
+++ b/libelf/gelf_getrela.c
@@@ -1,13 -1,24 +1,24 @@@
  /* Get RELA relocation information at given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
 +   Copyright (C) 2000-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2000.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/gelf_getsym.c
index 77df2dc57497441f6f244398166ca3e14fff4943,183872e2fb2447ffb5ff410af709204908c30baf..40347e8ca6a9fcc4383c621f9b09553553bacd75
--- 1/libelf/gelf_getsym.c
--- 2/libelf/gelf_getsym.c
+++ b/libelf/gelf_getsym.c
@@@ -1,13 -1,24 +1,24 @@@
  /* Get symbol information from symbol table at the given index.
 -   Copyright (C) 1999, 2000, 2001, 2002 Red Hat, Inc.
 +   Copyright (C) 1999-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 1999.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/gelf_getsyminfo.c
index 03e32a17543d37558f8e4010246ca16d6de4afce,09c9cee0b702e6783542aa5ebd932352336094c1..1b75cb868f1f4a30155752bde14dccf2815ce696
--- 1/libelf/gelf_getsyminfo.c
--- 2/libelf/gelf_getsyminfo.c
+++ b/libelf/gelf_getsyminfo.c
@@@ -1,13 -1,24 +1,24 @@@
  /* Get additional symbol information from symbol table at the given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
 +   Copyright (C) 2000-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2000.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/gelf_getsymshndx.c
index c574a2a6171dcef3294c571dbb5b5917fc4d9a45,91e1bf604f19c437e2a4a9ed48ba907d044773d5..d51b3aa55a7e81d1e137382659ba13f4bf99d4de
--- 1/libelf/gelf_getsymshndx.c
--- 2/libelf/gelf_getsymshndx.c
+++ b/libelf/gelf_getsymshndx.c
@@@ -1,14 -1,25 +1,25 @@@
  /* Get symbol information and separate section index from symbol table
     at the given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
 +   Copyright (C) 2000-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2000.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/gelf_getversym.c
index 1abfce0b0ce7c3f937520900188b58ecb0c31db4,9e80efc02467ef0336a934c7450178e43369e476..e7245e7e5da980d99484cd18428a5fcb6b063a0f
--- 1/libelf/gelf_getversym.c
--- 2/libelf/gelf_getversym.c
+++ b/libelf/gelf_getversym.c
@@@ -1,13 -1,24 +1,24 @@@
  /* Get symbol version information at the given index.
 -   Copyright (C) 1999, 2000, 2001, 2002 Red Hat, Inc.
 +   Copyright (C) 1999-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 1999.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/gelf_update_dyn.c
index 08bd9bb3f911a47b8612f0f7b093063225d2336e,94408c8400e261cfe90bbf9da5f6ef7617634856..f0c8585b66fdc27ca300cfe2741bf268d64cf080
--- 1/libelf/gelf_update_dyn.c
--- 2/libelf/gelf_update_dyn.c
+++ b/libelf/gelf_update_dyn.c
@@@ -1,13 -1,24 +1,24 @@@
  /* Update information in dynamic table at the given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
 +   Copyright (C) 2000-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2000.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/gelf_update_lib.c
index efbb9b6d359b50883559f38128d8b07275b23a29,4700bef830238a229da60564cffbc2e4598a9375..dc60072f1b351ff018af8b1e6cd5ac364e822e4d
--- 1/libelf/gelf_update_lib.c
--- 2/libelf/gelf_update_lib.c
+++ b/libelf/gelf_update_lib.c
@@@ -1,13 -1,24 +1,24 @@@
  /* Update library in table at the given index.
 -   Copyright (C) 2004 Red Hat, Inc.
 +   Copyright (C) 2004-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2004.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/gelf_update_move.c
index cb3d4ad3c30f1a3336cbcccaab4ea2a24732cff1,102a45b85ca13fbf837f677bc3d636e5bf2c2850..d6fa538094ff88e7078d05b3d4f86e3761a296ab
--- 1/libelf/gelf_update_move.c
--- 2/libelf/gelf_update_move.c
+++ b/libelf/gelf_update_move.c
@@@ -1,13 -1,24 +1,24 @@@
  /* Update move structure at the given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
 +   Copyright (C) 2000-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2000.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/gelf_update_rel.c
index f966fc7428c3fc1129af4c7a300dafc2af6484cb,d13e4028019e93228ba5dbee8b5e764a8f464887..38a08973e05f5a128e5ecf7a815799bb2ec0ab7c
--- 1/libelf/gelf_update_rel.c
--- 2/libelf/gelf_update_rel.c
+++ b/libelf/gelf_update_rel.c
@@@ -1,13 -1,24 +1,24 @@@
  /* Update REL relocation information at given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
 +   Copyright (C) 2000-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2000.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/gelf_update_rela.c
index 31234c170193e0addfaa4dad4b80f043f8e8346e,cc70297e14d5b75de88b626517e712db41ffa014..446af869b2de892df3bc59377bb99ceddaace2a8
--- 1/libelf/gelf_update_rela.c
--- 2/libelf/gelf_update_rela.c
+++ b/libelf/gelf_update_rela.c
@@@ -1,13 -1,24 +1,24 @@@
  /* Update RELA relocation information at given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
 +   Copyright (C) 2000-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2000.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/gelf_update_sym.c
index 960df2ec855a4b7af8847c78bd25e8bdb68003d8,ab37641c05c28a95a431feaa59d40115b51a04d5..3d24fc912c14fa80e7c5ceaa460bc31eeff3bffd
--- 1/libelf/gelf_update_sym.c
--- 2/libelf/gelf_update_sym.c
+++ b/libelf/gelf_update_sym.c
@@@ -1,13 -1,24 +1,24 @@@
  /* Update symbol information in symbol table at the given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
 +   Copyright (C) 2000-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2000.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/gelf_update_syminfo.c
index 758d35bd7d43847cb119ae7e6e9e78a78cf81af8,5654a0d94de311f26a4243b7b70b3dd5c1eb5f52..a497a0ae53ff5bfed492db0ebc65fbf70571d9f5
--- 1/libelf/gelf_update_syminfo.c
--- 2/libelf/gelf_update_syminfo.c
+++ b/libelf/gelf_update_syminfo.c
@@@ -1,13 -1,24 +1,24 @@@
  /* Update additional symbol information in symbol table at the given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
 +   Copyright (C) 2000-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2000.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/gelf_update_symshndx.c
index 0b8f7beafdf66115f143581395a00783eb60ad06,d2bb5bbed8c99afa99893c0e64141fe0f76d8bd3..973b6b3bcf252d0e8e61322c2644fde4d51cedad
--- 1/libelf/gelf_update_symshndx.c
--- 2/libelf/gelf_update_symshndx.c
+++ b/libelf/gelf_update_symshndx.c
@@@ -1,14 -1,25 +1,25 @@@
  /* Update symbol information and section index in symbol table at the
     given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
 +   Copyright (C) 2000-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2000.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/gelf_update_versym.c
index b4e9c17d27d906db7b95c1cbf82d1ab7dc6846fa,a4cec1f3ec9a691eb743f960fce3a257776d80df..529116aca1d8a5de225b47d7e9bf6e5d8fdba73c
--- 1/libelf/gelf_update_versym.c
--- 2/libelf/gelf_update_versym.c
+++ b/libelf/gelf_update_versym.c
@@@ -1,13 -1,24 +1,24 @@@
  /* Update symbol version information.
 -   Copyright (C) 2001, 2002 Red Hat, Inc.
 +   Copyright (C) 2001-2009 Red Hat, Inc.
-    This file is part of Red Hat elfutils.
+    This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2001.
  
-    Red Hat elfutils 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; version 2 of the License.
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of either
  
-    Red Hat elfutils is distributed in the hope that it will be useful, but
+      * the GNU Lesser General Public License as published by the Free
+        Software Foundation; either version 3 of the License, or (at
+        your option) any later version
+ 
+    or
+ 
+      * 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
+ 
+    or both in parallel, as here.
+ 
+    elfutils 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.

diff --cc libelf/libelfP.h
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/elflint.c
Simple merge

diff --cc src/readelf.c
Simple merge

diff --cc src/strip.c
Simple merge