Merge commit 'da4441c44f6efccb6f7b7588404d9c6bfb7b6af8' into merge

Conflicts:
	libbb/vfork_daemon_rexec.c
	networking/wget.c
	procps/ps.c

1 files changed, 3 insertions, 3 deletions

diff --git a/shell/shell_common.c b/shell/shell_common.c
index 2d5c0db0f..c7b5b6122 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -375,9 +375,9 @@ shell_builtin_ulimit(char **argv)
 #endif
         /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
 
-        argc = 1;
-        while (argv[argc])
-                argc++;
+        argc = 1;
+        while (argv[argc])
+                argc++;
 
         opts = 0;
         while (1) {