merge of '12e7afc8ba07e14e6f4d6341b58f77d4156934e5'

     and '69f73a39a6309313a5c6b25b246f1886caf99020'

diff --cc 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
@@@ -27,8 -39,8 +27,6 @@@ SRCREV_pn-openmoko-messages2 ?= "${AUTO
  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}"