merge of '6933e9269c2cb234bae34723207669df9d2ff463'

     and 'f2f723a4030940d296455d3ecfcb3e698b408840'

diff --cc packages/tasks/task-sdk-sbox.bb
index bbba454,67d5ed4..5540bb6
--- 1/packages/tasks/task-sdk-sbox.bb
--- 2/packages/tasks/task-sdk-sbox.bb
+++ b/packages/tasks/task-sdk-sbox.bb
@@@ -8,8 -15,8 +15,11 @@@ RDEPENDS := "
      gdb \
      sbrsh \
      fakeroot \
+     matchbox-wm \
+     dbus \
+     joe \
      ipkg \
 -    "
 +    gettext-dev \
 +    pkgconfig-dev \
 +    ipkg-utils \
 +    "

diff --cc packages/tasks/task-sdk.bb
index ab64de9,7039077..f94f7f1
--- 1/packages/tasks/task-sdk.bb
--- 2/packages/tasks/task-sdk.bb
+++ b/packages/tasks/task-sdk.bb
@@@ -18,6 -20,92 +18,45 @@@ RDEPENDS_task-sdk-base := "
      glibc \
      glibc-dev \
      libgcc1 \
+     alsa-dev \
+     audiofile-dev \
+     bluez-libs-dev \
+     dbus-dev \
+     expat-dev \
+     fontconfig-dev \
+     freetype-dev \
+     glib-2.0-dev \
+     gstreamer-dev \
+     libice-dev \
      ipkg-dev \
-     "
+     jpeg-dev \
+     libapm-dev \
+     alsa-lib-dev \
+     libdisplaymigration-dev \
+     libetpan-dev \
+     libgcrypt-dev \
+     libglade-dev \
+     gnutls-dev \
+     libgpg-error-dev \
+     libidl-dev \
+     libiw-dev \
+     libmimedir-dev \
+     libpcap-dev \
+     libpixman-dev \
+     libpng-dev \
+     libschedule-dev \
+     libsm-dev \
+     libsoundgen-dev \
+     libsoup-dev \
+     libsvg-dev \
+     libtododb-dev \
+     libts-dev \
+     libxml2-dev \
+     ncurses-dev \
+     openobex-dev \
+     popt-dev \
+     readline-dev \
+     libsqlite-dev \
+     zlib-dev \
+     libxmu-dev"
  
 -RDEPENDS_task-sdk-x11 := "\
 -    atk-dev \
 -    cairo-dev \
 -    gconf-dbus-dev \
 -    gtk+-dev \
 -    gtk-engines-dev \
 -    libsvg-cairo-dev \
 -    libmatchbox-dev \
 -    matchbox-desktop-dev \
 -    pango-dev \
 -    startup-notification-dev"
 -
 -RDEPENDS_task-sdk-x11-ext := "\
 -    libxcursor-dev \
 -    libxdmcp-dev \
 -    libxft-dev \
 -    libxrandr-dev \
 -    libxrender-dev \
 -    libxsettings-client-dev \
 -    randrext-dev \
 -    resourceext-dev \
 -    libx11-dev \
 -    libxau-dev \
 -    libxcalibrate-dev \
 -    xcalibrateext-dev \
 -    libxcomposite-dev \
 -    libxdamage-dev \
 -    libxext-dev \
 -    xextproto-dev \
 -    libxfont-dev \
 -    libxpm-dev \
 -    xproto-dev \
 -    libxt-dev \
 -    xtrans-dev \
 -    libxtst-dev"
 -
 -
 -RDEPENDS_task-sdk-gpe := "\
 -    libcontactsdb-dev \
 -    esound-dev \
 -    libeventdb-dev \
 -    libgpepimc-dev \
 -    libgpevtype-dev \
 -    libgpelaunch-dev \
 -    libgpewidget-dev \
 -    libhandoff-dev"
 -