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

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 8794892142fc73c09213ef98d4d83e66752c216b,ac0c772c50ade776c559b03ce5e6ae43598d7ad1..058f3de82210818372a6586fbd8811ed2790913b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,9 @@@
  2011-04-02  Ulrich Drepper  <drepper@gmail.com>
  
 +      * sysdeps/unix/sysv/linux/bits/time.h (CLOCK_BOOTTIME): Define.
 +
+       * include/features.h: Mention __USW_XOPEN2K8 in comment.
+ 
  2011-03-26  H.J. Lu  <hongjiu.lu@intel.com>
  
        [BZ #12518]