Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 16187bb,2060482..48c7586
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,9 +1,15 @@@
 +2011-06-29  Ulrich Drepper  <drepper@gmail.com>
 +
 +      * nscd/grpcache.c (cache_addgr): Don't write notfound reply if we
 +      are re-adding the entry.
 +      * nscd/servicescache.c (cache_addserv): Likewise.
 +
+ 2011-06-30  Aurelien Jarno  <aurelien@aurel32.net>
+ 
+       * sysdeps/generic/dl-irel.h: fix protection against multiple
+       inclusions.
+       * sysdeps/generic/dl-irel.h (elf_ifunc_invoke): New.
+ 
  2011-06-28  Ulrich Drepper  <drepper@gmail.com>
  
        [BZ #12935]