Merge 1.16.2 remote branch 'remotes/busybox/1_16_stable'

author Dylan Simon <dylan@dylex.net>

Tue, 15 Jun 2010 22:50:34 +0000 (18:50 -0400)

committer Dylan Simon <dylan@dylex.net>

Tue, 15 Jun 2010 22:52:45 +0000 (18:52 -0400)
author Dylan Simon <dylan@dylex.net>
Tue, 15 Jun 2010 22:50:34 +0000 (18:50 -0400)
committer Dylan Simon <dylan@dylex.net>
Tue, 15 Jun 2010 22:52:45 +0000 (18:52 -0400)
diff --cc Makefile

index a195ddc,5fad19f..734bc58
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
   VERSION = 1
   PATCHLEVEL = 16
- SUBLEVEL = 1
+ SUBLEVEL = 2
- -EXTRAVERSION =
+ +EXTRAVERSION = android
   NAME = Unnamed
   
   # *DOCUMENTATION*
diff --cc include/platform.h
Simple merge
diff --cc shell/ash.c
Simple merge
author	Dylan Simon <dylan@dylex.net>
	Tue, 15 Jun 2010 22:50:34 +0000 (18:50 -0400)
committer	Dylan Simon <dylan@dylex.net>
	Tue, 15 Jun 2010 22:52:45 +0000 (18:52 -0400)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/platform.h	patch \|	diff1 \|	diff2 \|	blob \| history
shell/ash.c	patch \|	diff1 \|	diff2 \|	blob \| history