please merge busybox 1.1.3-2ubuntu1

debdiff busybox_1.1.3-1ubuntu1.dsc busybox_1.1.3-2ubuntu1.dsc
diff -Nru /tmp/BEnDxZKfQQ/busybox-1.1.3/coreutils/sort.c /tmp/Y6CCffF8sr/busybox-1.1.3/coreutils/sort.c
--- /tmp/BEnDxZKfQQ/busybox-1.1.3/coreutils/sort.c 2006-04-17 02:27:46.000000000 +1000
+++ /tmp/Y6CCffF8sr/busybox-1.1.3/coreutils/sort.c 2006-07-12 09:40:06.000000000 +1000
@@ -74,9 +74,7 @@
                        for(i=1;i<key->range[2*j]+j;i++) {
                                /* Skip leading blanks or first separator */
                                if(str[end]) {
- if(key_separator) {
- if(str[end]==key_separator) end++;
- } else if(isspace(str[end]))
+ if(!key_separator && isspace(str[end]))
                                                while(isspace(str[end])) end++;
                                }
                                /* Skip body of key */
diff -Nru /tmp/BEnDxZKfQQ/busybox-1.1.3/debian/changelog /tmp/Y6CCffF8sr/busybox-1.1.3/debian/changelog
--- /tmp/BEnDxZKfQQ/busybox-1.1.3/debian/changelog 2006-07-12 09:40:05.000000000 +1000
+++ /tmp/Y6CCffF8sr/busybox-1.1.3/debian/changelog 2006-07-12 09:40:06.000000000 +1000
@@ -1,3 +1,16 @@
+busybox (1:1.1.3-2ubuntu1) edgy; urgency=low
+
+ * Resynchronise with Debian.
+
+ -- Anibal Monsalve Salazar <email address hidden> Tue, 11 Jul 2006 19:21:45 +1000
+
+busybox (1:1.1.3-2) unstable; urgency=low
+
+ * coreutils/sort.c:
+ - Fix sorting of input which begins with the seperator. (closes: #373704)
+
+ -- Bastian Blank <email address hidden> Thu, 29 Jun 2006 19:36:19 +0000
+
 busybox (1:1.1.3-1ubuntu1) edgy; urgency=low

   * Resynchronise with Debian.
diff -Nru /tmp/BEnDxZKfQQ/busybox-1.1.3/testsuite/sort.tests /tmp/Y6CCffF8sr/busybox-1.1.3/testsuite/sort.tests
--- /tmp/BEnDxZKfQQ/busybox-1.1.3/testsuite/sort.tests 2006-04-17 02:27:46.000000000 +1000
+++ /tmp/Y6CCffF8sr/busybox-1.1.3/testsuite/sort.tests 2006-07-12 09:40:06.000000000 +1000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash

 # SUSv3 compliant sort tests.
 # Copyright 2005 by Rob Landley <email address hidden>
@@ -66,4 +66,18 @@
 egg 1 2 papyrus
 " "$data" ""

+testing "sort key doesn't strip leading blanks, disables fallback global sort" \
+"sort -n -k2 -t ' '" " a \n 1 \n 2 \n" "" " 2 \n 1 \n a \n"
+
+testing "sort key edge case with -t" "sort -n -k4 -t/" \
+"/usr/lib/finish-install.d/1
+/usr/lib/finish-install.d/4
+/usr/lib/prebaseconfig.d/2
+/usr/lib/prebaseconfig.d/6
+" "" "/usr/lib/finish-install.d/1
+/usr/lib/prebaseconfig.d/2
+/usr/lib/finish-install.d/4
+/usr/lib/prebaseconfig.d/6
+"
+
 exit $FAILCOUNT

Merge uploaded. Thanks!