merge of '26501141207c84e31e0f43c5795a15c0f16dbce5'

     and '86618f966282489d43b51fbf0ee93b954ac615ae'

diff --cc conf/distro/include/sane-srcrevs.inc
index 39550c2,d8b9ddb..b0c41be
--- 1/conf/distro/include/sane-srcrevs.inc
--- 2/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@@ -146,10 -148,10 +148,10 @@@ SRCREV_pn-settings-daemon ?= "1755
  SRCREV_pn-sjf2410-linux-native ?= "933"
  SRCREV_pn-sphyrna ?= "45"
  SRCREV_pn-tmut ?= "60"
 -SRCREV_pn-u-boot-openmoko ?= "4100"
 +SRCREV_pn-u-boot-openmoko ?= "4138"
  SRCREV_pn-usbpath ?= "3108"
  SRCREV_pn-usbpath-native ?= "3108"
- SRCREV_pn-webkit-gtk ?= "28656"
+ SRCREV_pn-webkit-gtk ?= "30762"
  SRCREV_pn-webkit-qt ?= "28656"
  SRCREV_pn-webkit-qtopia ?= "28656"
  SRCREV_pn-wesnoth ?= "22021"

diff --cc packages/gypsy/gypsy.inc
Simple merge