merge of 8b12e35772d79306d1d9de19c12b23681618532d

     and 9196568e0dbd2c788b83bbc73b90bb0699de6695

packages/gpe-filemanager/gpe-filemanager_0.25.bb

@@ -1,12 +1,12 @@
 
 inherit gpe
 
-PR          = "r0"
+PR          = "r1"
 LICENSE     = "GPL"
 DESCRIPTION = "GPE file manager"
 DEPENDS     = "libgpewidget gnome-vfs dbus"
 SECTION     = "gpe"
 RDEPENDS    = "gpe-icons"
-RRECOMMENDS = "gnome-vfs-plugin-file"
+RRECOMMENDS = "gnome-vfs-plugin-file gnome-vfs-plugin-smb gnome-vfs-plugin-ftp gnome-vfs-plugin-computer gnome-vfs-plugin-network gnome-vfs-plugin-sftp gnome-vfs-plugin-http"
 
 FILES_${PN} += " ${datadir}/gpe"

packages/meta/gpe-image.bb

@@ -3,7 +3,7 @@ FEED_URIS_append_opensimpad = " x11##http://ewi546.ewi.utwente.nl/mirror/www.ope
                                 gpe##http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
 FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11"
 
-PR = "r21"
+PR = "r22"
 
 export IMAGE_BASENAME = "gpe-image"
 
@@ -23,7 +23,7 @@ GPE_EXTRA_INSTALL_smallscreen = "gpe-task-games ${GPE_EXTRA_THEMES}"
 #ship more stuff with devices with >16MB of flash
 GPE_BIGFLASH_DEPENDS := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\
         gpe-theme-clearlooks \
-	sylpheed \
+	vlc-gpe \
         figment \
 ",d)}'