propagate from branch 'org.openembedded.dev' (head 7c2dfd8725acfc6de0286a17d58cccbfa6...

            to branch 'org.openembedded.dev.avr32' (head 6a2246abf3d894c89fc60280e99b73072b879e02)

diff --cc packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index e49650d,3cc6707..7822e40
--- 1/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
--- 2/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@@ -19,8 -19,9 +19,10 @@@ SRC_URI = "${XORG_MIRROR}/individual/xs
        file://w100.patch;patch=1 \
        file://w100-autofoo.patch;patch=1 \
        file://w100-fix-offscreen-bmp.patch;patch=1 \
-       file://xorg-avr32-support.diff;patch=1 \
-         "
 -        file://kdrive-1.3-18bpp.patch;patch=1 \
 -        file://gumstix-kmode.patch;patch=1 \
++    file://xorg-avr32-support.diff;patch=1 \
++    file://kdrive-1.3-18bpp.patch;patch=1 \
++    file://gumstix-kmode.patch;patch=1 \
+ "
  
  S = "${WORKDIR}/xorg-server-${PV}"