merge of 599c09d67423118adcf4ed6ee44637260778ff74

     and 8fbc8e73670d1f0b1c156b5be2c15cb389f2128e

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

diff --cc packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
index d3166a9,c26f12e..5a911db
--- 1/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
--- 2/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
+++ b/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
@@@ -10,5 -10,5 +10,5 @@@ XORG_PN = "libXcomposite
  
  include xorg-xlibs.inc
  
 -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-X11R7.0-${PV}.tar.bz2 \
 -         file://change-include-order.patch;patch=1"
 +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-${PV}.tar.bz2 \
-          file://change-include-order.patch;patch=1"
++         file://change-include-order.patch;patch=1"