merge of '9a5df4f82194968b8ea8a94d7effc5bf61c1e650'

     and 'cb1970d64a9cdb9559e137f509557905fbc174b5'

diff --cc packages/busybox/busybox_1.9.1.bb
index 237f6a6,1626b1c..3f8184f
--- 1/packages/busybox/busybox_1.9.1.bb
--- 2/packages/busybox/busybox_1.9.1.bb
+++ b/packages/busybox/busybox_1.9.1.bb
@@@ -2,6 -2,9 +2,10 @@@ require busybox.in
  PR = "r2"
  
  SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
+            http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch;patch=1 \
+            file://udhcpscript.patch;patch=1 \
+            file://adduser-longops.patch;patch=1 \
++           file://sort-z-nul.patch;patch=1;status=upstream \
             file://busybox-cron \
             file://busybox-httpd \
             file://busybox-udhcpd \