merge of 46c1cdea7bf65d8ba6bbe951e7408d24d5b05d06

     and 8cd65284f1d330175ae2d67c03b8a2c1b41e858a

diff --cc packages/glibc/glibc_2.3.5+cvs20050627.bb
Simple merge

diff --cc packages/xlibs/libxss_1.0.1.bb
index fa6cb61,92dd4c8..54abc86
--- 1/packages/xlibs/libxss_1.0.1.bb
--- 2/packages/xlibs/libxss_1.0.1.bb
+++ b/packages/xlibs/libxss_1.0.1.bb
@@@ -7,9 -7,9 +7,14 @@@ DEPENDS = "libx11 libxext xextproto scr
  PROVIDES = "libxss"
  RREPLACES = "libxss"
  
- XORG_PN = "libXscrnSaver"
 -XORG_PN = "libXScrnSaver"
++SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXScrnSaver-${PV}.tar.bz2"
++S = "${WORKDIR}/libXScrnSaver-${PV}"
  
--include xorg-xlibs.inc
++inherit autotools pkgconfig
  
  #CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
  EXTRA_OECONF="--enable-malloc0returnsnull"
++
++do_stage() {
++      autotools_stage_all
++}