merge of '09957ec14fdf3babf0d22d779c7264d24330e535'

     and 'c03b12513a0d9faea02ff87386f5cb243f7ece3e'

diff --cc conf/distro/include/preferred-gpe-versions-2.8.inc
index 9405681,a31466a..acc8498
--- 1/conf/distro/include/preferred-gpe-versions-2.8.inc
--- 2/conf/distro/include/preferred-gpe-versions-2.8.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.8.inc
@@@ -33,7 -38,14 +38,13 @@@ PREFERRED_VERSION_gpe-su ?= "0.19
  PREFERRED_VERSION_keylaunch ?= "2.0.10"
  PREFERRED_VERSION_startup-monitor ?= "0.18-2"
  PREFERRED_VERSION_gpe-dm ?= "0.51"
+ PREFERRED_VERSION_ipaq-sleep ?= "0.9"
+ PREFERRED_VERSION_teleport ?= "0.34"
+ PREFERRED_VERSION_xst ?= "0.15"
  
 -
+ PREFERRED_VERSION_gpe-aerial ?= "0.3.0"
+ PREFERRED_VERSION_gpe-appmgr ?= "2.8"
+ PREFERRED_VERSION_gpe-autostarter ?= "0.12"
  PREFERRED_VERSION_gpe-todo ?= "0.56"
  PREFERRED_VERSION_gpe-calendar ?= "0.91"
  PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9"