Merge branch 'busybox' into merge

1 files changed, 15 insertions, 4 deletions

diff --git a/coreutils/Config.src b/coreutils/Config.src
index 1bded03a6..6c9e47551 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -5,10 +5,6 @@
 
 menu "Coreutils"
 
-INSERT
-
-comment "Common options"
-
 config FEATURE_VERBOSE
         bool "Support verbose options (usually -v) for various applets"
         default y
@@ -17,6 +13,19 @@ config FEATURE_VERBOSE
         Also enables long option (--verbose) if it exists.
         Without this option, -v is accepted but ignored.
 
+comment "Common options for date and touch"
+
+config FEATURE_TIMEZONE
+        bool "Allow timezone in dates"
+        default y
+        depends on DESKTOP
+        help
+        Permit the use of timezones when parsing user-provided data
+        strings, e.g. '1996-04-09 12:45:00 -0500'.
+
+        This requires support for the '%z' extension to strptime() which
+        may not be available in all implementations.
+
 comment "Common options for cp and mv"
         depends on CP || MV
 
@@ -37,4 +46,6 @@ config FEATURE_HUMAN_READABLE
         help
         Allow df, du, and ls to have human readable output.
 
+INSERT
+
 endmenu