Merge busybox into merge

Fix merge conflict in coreutils/timeout.c.

1 files changed, 1 insertions, 1 deletions

diff --git a/coreutils/printf.c b/coreutils/printf.c
index cc26ecd03..da129f909 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -378,7 +378,7 @@ static char **print_formatted(char *f, char **argv, int *conv_err)
                                 }
                                 break;
                         }
-                        if (*f && strchr("-+ #", *f)) {
+                        while (*f && strchr("-+ #0", *f)) {
                                 ++f;
                                 ++direc_length;
                         }