From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 16 Dec 2007 08:45:18 +0000 (+0000)
Subject: merge of '12e7afc8ba07e14e6f4d6341b58f77d4156934e5'
X-Git-Tag: Release-2010-05/1~8136^2~29
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2f6ffd02f63a5689cdcf02c9ee5ad548623b5f0;p=openembedded.git

Merge ... '12e7afc8ba07e14e6f4d6341b58f77d4156934e5'
     and '69f73a39a6309313a5c6b25b246f1886caf99020'
---

f2f6ffd02f63a5689cdcf02c9ee5ad548623b5f0
diff --cc conf/distro/include/moko-autorev.inc
index 2cc722f013,85376da766..74b930781b
--- a/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}"