merge of '86c3bb401cff2bd54526bee645900700122e1549'

     and 'cd2d09bd89f1169ae4ec847af474c0e14580178d'

3 files changed, 10 insertions, 12 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index e3efa9f699..67380a3160 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -17,12 +17,12 @@ SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "606"
 SRCREV_pn-gnuradio ?= "6377"
-SRCREV_pn-hildon-1 ?= "13708"
+SRCREV_pn-hildon-1 ?= "14173"
 SRCREV_pn-libgsmd ?= "2957"
 SRCREV_pn-libmokogsmd2 ?= "2950"
 SRCREV_pn-libmokojournal2 ?= "2780"
 SRCREV_pn-libmokopanelui2 ?= "2958"
-SRCREV_pn-libmokoui2 ?= "3053"
+SRCREV_pn-libmokoui2 ?= "3064"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
@@ -47,9 +47,9 @@ SRCREV_pn-openmoko-calculator2 ?= "2789"
 SRCREV_pn-openmoko-common ?= "397"
 SRCREV_pn-openmoko-common2 ?= "2679"
 SRCREV_pn-openmoko-contacts ?= "2298"
-SRCREV_pn-openmoko-contacts2 ?= "335"
+SRCREV_pn-openmoko-contacts2 ?= "350"
 SRCREV_pn-openmoko-dates ?= "467"
-SRCREV_pn-openmoko-dates2 ?= "563"
+SRCREV_pn-openmoko-dates2 ?= "617"
 SRCREV_pn-openmoko-dialer ?= "2811"
 SRCREV_pn-openmoko-dialer2 ?= "2976"
 SRCREV_pn-openmoko-feedreader2 ?= "3060"
@@ -57,11 +57,11 @@ SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "2873"
 SRCREV_pn-openmoko-footer ?= "2354"
 SRCREV_pn-openmoko-icon-theme-standard ?= "2232"
-SRCREV_pn-openmoko-icon-theme-standard2 ?= "3055"
-SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "2967"
+SRCREV_pn-openmoko-icon-theme-standard2 ?= "3066"
+SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3066"
 SRCREV_pn-openmoko-keyboard ?= "1631"
 SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "2952"
+SRCREV_pn-openmoko-mediaplayer2 ?= "3057"
 SRCREV_pn-openmoko-messages ?= "2276"
 SRCREV_pn-openmoko-panel-battery ?= "2897"
 SRCREV_pn-openmoko-panel-bt ?= "2896"
@@ -79,14 +79,14 @@ SRCREV_pn-openmoko-stylus-demo ?= "2324"
 SRCREV_pn-openmoko-stylus-demo-simple ?= "1818"
 SRCREV_pn-openmoko-taskmanager ?= "1663"
 SRCREV_pn-openmoko-tasks ?= "320"
-SRCREV_pn-openmoko-tasks2 ?= "320"
+SRCREV_pn-openmoko-tasks2 ?= "343"
 SRCREV_pn-openmoko-terminal2 ?= "2972"
 SRCREV_pn-openmoko-theme-standard ?= "2370"
 SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
-SRCREV_pn-openmoko-theme-standard2 ?= "2964"
+SRCREV_pn-openmoko-theme-standard2 ?= "3044"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "2964"
 SRCREV_pn-openmoko-today ?= "3056"
-SRCREV_pn-openmoko-today2 ?= "2955"
+SRCREV_pn-openmoko-today2 ?= "3056"
 SRCREV_pn-openmoko-today2-folders ?= "2680"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"
diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index 6aa1885293..44454f3902 100644
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -21,7 +21,6 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget
 # Software/packages selection
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.19-hh8"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 7cea4e08de..87e03a7bdd 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -30,7 +30,6 @@ PCMCIA_MANAGER = "pcmciautils"
 MODUTILS = "26"	
 
 XSERVER = "xserver-kdrive-w100"
-PREFERRED_VERSION_xserver-kdrive = "1.2.0"
 
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"