merge of '7393275c6ccce67cadeb49d4afb3459e56edf8a9'

     and '7db6cb955e300c7001070d592c749d71ca29a88f'

diff --combined packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
index 3ccfe28,a3d00ca..f200c16
--- 1/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
--- 2/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
+++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
@@@ -11,12 -11,11 +11,12 @@@ LICENSE = "GPL
  PRIORITY = "optional"
  HOMEPAGE = "http://www.trolltech.com"
  DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst"
 +RDEPENDS = "atd tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific"
  PROVIDES = "qtopia-phone"
 -PR = "r7"
 +PR = "r8"
  SRCREV = "${AUTOREV}"
  SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \
 -           file://Xsession.d/99qtopia \
 +           file://Xsession.d/89qtopia \
             file://qtopia.sh"
  
  S = "${WORKDIR}/git"
@@@ -99,7 -98,7 +99,7 @@@ do_install() 
  
     # Make sure qpe gets launched by X
     install -d ${D}/${sysconfdir}/X11/Xsession.d
-    install -m 0755 ${WORKDIR}/Xsession.d/99qtopia ${D}${sysconfdir}/X11/Xsession.d/
+    install -m 0755 ${WORKDIR}/Xsession.d/89qtopia ${D}${sysconfdir}/X11/Xsession.d/
  
     # Install some scripts
     install -d ${D}${bindir}