merge of '1168c6045fce975d6d8f7098c478705bea1622c8'

     and '7eab9a5db962d1b8a39d67ad82cffc92b511633b'

3 files changed, 16 insertions, 17 deletions

diff --git a/packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf b/packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf
index f9fde86d2d..5faa6bcff3 100644
--- a/packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf
+++ b/packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf
@@ -2,24 +2,24 @@
 # All sizes and positions have pixels as units.
 # The align setting is a positive value from 0 (left) to 10 (right).
 
-[Key 1]                                                        
+[Key 1]
 label = left
-width = 180
-height = 36
-xpos = 5
-ypos = 5
-xpos_menu = 5
-ypos_menu = 30
+width = 200
+height = 44
+xpos = 0
+ypos = 2
+xpos_menu = 1
+ypos_menu = 1
 align = 1
 key = F3
-              
+
 [Key 2]
 label = right
-width = 180
-height = 36
-xpos = 295
-ypos = 5
-xpos_menu = 5
-ypos_menu = 30
+width = 200
+height = 44
+xpos = 280
+ypos = 2
+xpos_menu = 1
+ypos_menu = 1
 align = 9
 key = F4
diff --git a/packages/gpephone/gpe-applauncher_0.11.bb b/packages/gpephone/gpe-applauncher_0.11.bb
index 1efcd793e0..35342c11d2 100644
--- a/packages/gpephone/gpe-applauncher_0.11.bb
+++ b/packages/gpephone/gpe-applauncher_0.11.bb
@@ -2,7 +2,7 @@ LICENSE     = "GPL"
 DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
-PR          = "r1"
+PR          = "r2"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 
diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb
index 27cb26174b..a77233bedc 100644
--- a/packages/tasks/task-gpephone.bb
+++ b/packages/tasks/task-gpephone.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition"
-PR = "r9"
+PR = "r10"
 LICENSE = "MIT"
 
 inherit task
@@ -88,5 +88,4 @@ RDEPENDS_gpephone-task-apps = "\
     gpe-windowlist"
 
 RDEPENDS_gpephone-task-connectivity = "\
-    email \
 "