merge of '12e7afc8ba07e14e6f4d6341b58f77d4156934e5'

     and '69f73a39a6309313a5c6b25b246f1886caf99020'

diff --combined conf/distro/include/moko-autorev.inc
index 2cc722f,85376da..74b9307
--- 1/conf/distro/include/moko-autorev.inc
--- 2/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@@ -10,35 -10,56 +10,33 @@@ SRCREV_pn-linux-openmoko-devel ?= "${AU
  SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
  SRCREV_pn-neod ?= "${AUTOREV}"
  
 -#SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
  SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
  SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
  SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
  SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-common ?= "${AUTOREV}"
  SRCREV_pn-openmoko-common2 ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-contacts ?= "${AUTOREV}"
  SRCREV_pn-openmoko-contacts2 ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-dates ?= "${AUTOREV}"
  SRCREV_pn-openmoko-dates2 ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-dialer ?= "${AUTOREV}"
  SRCREV_pn-openmoko-dialer2 ?= "${AUTOREV}"
  SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-finger-demo ?= "${AUTOREV}"
  SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-footer ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-icon-theme-standard ?= "${AUTOREV}"
  SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}"
  SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-libs ?= "${AUTOREV}"
  SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-messages ?= "${AUTOREV}"
  SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}"
  SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}"
  SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}"
  SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}"
- SRCREV_pn-openmoko-panel-demo ?= "${AUTOREV}"
- SRCREV_pn-openmoko-panel-demo-simple ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-panel-demo ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-panel-demo-simple ?= "${AUTOREV}"
  SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}"
  SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
  SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
  SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-session ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}"
 +SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
  SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-tasks ?= "${AUTOREV}"
  SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
  SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}"
  SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
  SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
 -#SRCREV_pn-openmoko-today ?= "${AUTOREV}"
  SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
  SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
  SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
@@@ -51,4 -72,3 +49,3 @@@ SRCREV_pn-dfu-util ?= "${AUTOREV}
  SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
  SRCREV_pn-usbpath ?= "${AUTOREV}"
  SRCREV_pn-usbpath-native ?= "${AUTOREV}"
-