merge of '1d39316900e922826574e74f55a807cf58b313f7'

     and '4dc379aab7427cdddc45871616c34a79875f1b3f'

diff --cc packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
Simple merge

diff --cc packages/tasks/task-toolchain-openmoko-sdk.bb
index 945b4774f9670e1a70587f61a381a3badfaf473b,a8f9b04d2dc9d8884ed6e1405640b6ac8a12f178..bcb2d370a69cee0b229c0d891d1db41f6a1bb0ca
--- 1/packages/tasks/task-toolchain-openmoko-sdk.bb
--- 2/packages/tasks/task-toolchain-openmoko-sdk.bb
+++ b/packages/tasks/task-toolchain-openmoko-sdk.bb
@@@ -26,6 -25,5 +26,6 @@@ RDEPENDS_${PN} = "
      libmokoui2-dev \
      libmokopanelui2-dev \
      libmokojournal2-dev \
-     \
 +    openmoko-sample2-src \
+     openmoko-toolchain-scripts \
  "