diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index f1faa87aa8..89f5916dac 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -83,116 +83,117 @@ PREFERRED_PROVIDER_opkg ?= "opkg"
 #
 # Source dates or revisions to use:
 #
+
+SRCDATE_abiword ?= "20070130"
+SRCDATE_gtk-theme-torturer ?= "20060821"
+SRCDATE_ipkg-link-1 ?= "20050930"
+SRCDATE_ipkg-link ?= "20050930"
+SRCDATE_ipkg-utils-native ?= "20050930"
+SRCDATE_ipkg-utils ?= "20050930"
+SRCDATE_libgsmd ?= "20070917"
+SRCDATE_libmatchbox ?= "20070417"
+SRCDATE_maemo-mapper-nohildon ?= "20061114"
+SRCDATE_matchbox-panel-manager ?= "20060612"
+SRCDATE_minimo ?= "20070510"
+SRCDATE_oprofile ?= "20080210"
+SRCDATE_xcalibrateext ?= "20051101"
+SRCDATE_xcalibrate ?= "20060312"
+SRCDATE_yaffs2-utils-native = "20071107"
+SRCDATE_yaffs2-utils = "20071107"
+
+PV_pn-calibrateproto ?= "0.0-poky1-${SRCREV}"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+SRCREV_pn-clipboard-manager ?= "14994"
+SRCREV_pn-clutter-box2d = "2743"
+SRCREV_pn-clutter-gst ?= "2616"
+SRCREV_pn-clutter ?= "2616"
+SRCREV_pn-eds-dbus ?= "629"
+SRCREV_pn-evince ?= "2437"
+SRCREV_pn-exmap-console ?= "266"
+SRCREV_pn-fstests ?= "266"
+SRCREV_pn-gaku ?= "375"
 SRCREV_pn-gconf-dbus ?= "638"
 SRCREV_pn-gtkhtml2 ?= "1144"
-SRCREV_pn-web ?= "97"
-SRCREV_pn-web-webkit ?= "107"
-SRCREV_pn-eds-dbus ?= "629"
-SRCDATE_minimo ?= "20070510"
-SRCDATE_ipkg-utils-native ?= "20050930"
-SRCDATE_ipkg-link-1 ?= "20050930"
-SRCDATE_ipkg-utils ?= "20050930"
-SRCDATE_ipkg-link ?= "20050930"
+SRCREV_pn-gtk-sato-engine ?= "90"
+SRCREV_pn-gtk-theme-torturer ?= "99962ae39bb5aadb31929b25c58e1a053f9c9545"
+SRCREV_pn-gypsy ?= "147"
+SRCREV_pn-libfakekey ?= "2031"
+SRCREV_pn-libowl ?= "354"
+SRCREV_pn-libsyncml ?= "241"
+PV_pn-libxcalibrate ?= "0.0-poky1-${SRCREV}"
+SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
+SRCREV_pn-libxosd ?= "627"
+SRCREV_pn-matchbox-applet-light ?= "1548"
 SRCREV_pn-matchbox-common ?= "1561"
 SRCREV_pn-matchbox-config-gtk ?= "1614"
+SRCREV_pn-matchbox-desktop-sato ?= "76"
 SRCREV_pn-matchbox-desktop ?= "2030"
 SRCREV_pn-matchbox-keyboard ?= "1910"
-SRCREV_pn-matchbox-panel ?= "1364"
-SRCDATE_matchbox-panel-manager ?= "20060612"
 SRCREV_pn-matchbox-panel-2 ?= "1971"
+SRCREV_pn-matchbox-panel ?= "1364"
 SRCREV_pn-matchbox-stroke ?= "1524"
-SRCREV_pn-matchbox-themes-extra ?= "1524"
 SRCREV_pn-matchbox-terminal ?= "1612"
-SRCREV_pn-matchbox-wm ?= "1524"
-SRCREV_pn-matchbox-wm-2 ?= "1873"
-SRCDATE_libmatchbox ?= "20070417"
-SRCREV_pn-settings-daemon ?= "1825"
-SRCREV_pn-screenshot ?= "288"
-SRCDATE_xcalibrateext ?= "20051101"
-SRCREV_pn-libfakekey ?= "2031"
-SRCDATE_xcalibrate ?= "20060312"
-SRCDATE_oprofile ?= "20080210"
-SRCREV_pn-oprofileui ?= "173"
-SRCREV_pn-zaurusd ?= "358"
-SRCREV_pn-owl-video-widget ?= "324"
-SRCREV_pn-psplash ?= "363"
-SRCDATE_maemo-mapper-nohildon ?= "20061114"
-SRCREV_pn-exmap-console ?= "266"
-SRCREV_pn-gtk-sato-engine ?= "90"
-SRCREV_pn-matchbox-theme-sato ?= "90"
 SRCREV_pn-matchbox-theme-sato-2 ?= "94"
-SRCREV_pn-matchbox-desktop-sato ?= "76"
-SRCREV_pn-evince ?= "2437"
+SRCREV_pn-matchbox-theme-sato ?= "90"
+SRCREV_pn-matchbox-themes-extra ?= "1524"
+SRCREV_pn-matchbox-wm-2 ?= "1873"
+SRCREV_pn-matchbox-wm ?= "1524"
 SRCREV_pn-oh-puzzles ?= "23"
-SRCREV_pn-libowl ?= "354"
-SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
-PV_pn-libxcalibrate ?= "0.0-poky1-${SRCREV}"
-SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
-PV_pn-calibrateproto ?= "0.0-poky1-${SRCREV}"
-SRCDATE_gtk-theme-torturer ?= "20060821"
-SRCREV_pn-gtk-theme-torturer ?= "99962ae39bb5aadb31929b25c58e1a053f9c9545"
-SRCREV_pn-libsyncml ?= "241"
-SRCREV_pn-matchbox-applet-light ?= "1548"
-SRCREV_pn-fstests ?= "266"
-SRCDATE_abiword ?= "20070130"
-SRCREV_pn-xvideo-tests ?= "272"
-SRCREV_pn-clutter ?= "2616"
-SRCREV_pn-clutter-gst ?= "2616"
-SRCDATE_libgsmd ?= "20070917"
-SRCREV_pn-gaku ?= "375"
-SRCREV_pn-gypsy ?= "147"
-SRCDATE_yaffs2-utils = "20071107"
-SRCDATE_yaffs2-utils-native = "20071107"
-SRCREV_pn-webkit-gtk ?= "31859"
-SRCREV_pn-clipboard-manager ?= "14994"
-SRCREV_pn-opkg ?= "4209"
 SRCREV_pn-opkg-native ?= "4209"
 SRCREV_pn-opkg-sdk ?= "4209"
-SRCREV_pn-libxosd ?= "627"
+SRCREV_pn-opkg ?= "4209"
+SRCREV_pn-oprofileui ?= "173"
+SRCREV_pn-owl-video-widget ?= "324"
+SRCREV_pn-psplash ?= "363"
 QEMUSRCREV = "4242"
-#QEMUSRCREV = "4027"
 SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu ?= "${QEMUSRCREV}"
+SRCREV_pn-screenshot ?= "288"
+SRCREV_pn-settings-daemon ?= "1825"
 SRCREV_pn-vincent ?= "246"
-SRCREV_pn-clutter-box2d = "2743"
+SRCREV_pn-webkit-gtk ?= "31859"
+SRCREV_pn-web-webkit ?= "107"
+SRCREV_pn-web ?= "97"
+SRCREV_pn-xvideo-tests ?= "272"
+SRCREV_pn-zaurusd ?= "358"
 
 # Previously floating revisions
 SRCREV_pn-aaina ?= "1231"
 SRCREV_pn-clutter-cairo ?= "1223"
 SRCREV_pn-clutter-gst ?= "1454"
-SRCREV_pn-table ?= "1456"
 SRCREV_pn-libmatchbox ?= "1531"
-SRCREV_pn-msynctool ?= "314"
-SRCREV_pn-libopensync-plugin-file-sync ?= "2392"
 SRCREV_pn-libopensync-plugin-evo2-sync ?= "2394"
+SRCREV_pn-libopensync-plugin-file-sync ?= "2392"
 SRCREV_pn-libopensync ?= "2430"
 SRCREV_pn-libsync ?= "208"
-SRCREV_pn-networkmanager ?= "2984"
+SRCREV_pn-msynctool ?= "314"
 SRCREV_pn-networkmanager-applet ?= "263"
+SRCREV_pn-networkmanager ?= "2984"
+SRCREV_pn-table ?= "1456"
 SRCREV_pn-ubootchart ?= "10"
 
-SRCREV_pn-uboot-openmoko_upstream ?= "1ce55151c85d068f70317a8d65c61058b891afb4"
-SRCREV_pn-uboot-openmoko_patches ?= "3400"
+SRCREV_pn-dfu-util-native = "3139"
+SRCREV_pn-dfu-util = "3139"
 SRCREV_pn-libgsmd ?= "4335"
-SRCREV_pn-linux-openmoko ?= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78"
-SRCREV_pn-usbpath-native = "3172"
-SRCREV_pn-usbpath = "3172"
-SRCREV_pn-openmoko-dialer2 = "3407"
-SRCREV_pn-openmoko-today2 = "3342"
+SRCREV_pn-libjana = "693"
 SRCREV_pn-libmokogsmd2 = "3378"
 SRCREV_pn-libmokojournal2 = "3217"
 SRCREV_pn-libmokoui2 = "3229"
-SRCREV_pn-openmoko-contacts2 = "363"
-SRCREV_pn-openmoko-today2-folders = "3379"
+SRCREV_pn-linux-openmoko ?= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78"
 SRCREV_pn-neod = "3409"
-SRCREV_pn-openmoko-tasks2 = "346"
-SRCREV_pn-openmoko-icon-theme-standard2 = "3247"
-SRCREV_pn-openmoko-dates2 = "659"
-SRCREV_pn-libjana = "693"
-SRCREV_pn-dfu-util = "3139"
-SRCREV_pn-dfu-util-native = "3139"
 SRCREV_pn-ohm = "edfe25d49d67884bf004de7ae0724c162bb5e65e"
+SRCREV_pn-openmoko-contacts2 = "363"
+SRCREV_pn-openmoko-dates2 = "659"
+SRCREV_pn-openmoko-dialer2 = "3407"
+SRCREV_pn-openmoko-icon-theme-standard2 = "3247"
+SRCREV_pn-openmoko-tasks2 = "346"
+SRCREV_pn-openmoko-today2-folders = "3379"
+SRCREV_pn-openmoko-today2 = "3342"
+SRCREV_pn-uboot-openmoko_patches ?= "3400"
+SRCREV_pn-uboot-openmoko_upstream ?= "1ce55151c85d068f70317a8d65c61058b891afb4"
+SRCREV_pn-usbpath-native = "3172"
+SRCREV_pn-usbpath = "3172"
 SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
 
 #