Merge branch 'master' into core32

Conflicts:
	version

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

2 files changed, 7 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index bfc65e33..d0453c01 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ Starting with 1.47, changes marked with SYSLINUX, PXELINUX, ISOLINUX
 or EXTLINUX apply to that specific program only; other changes apply
 to all derivatives.
 
+Changes in 3.82:
+
 Changes in 3.81:
 	* Shuffler: fix bug in real-mode entry.  This affected a
 	  number of modules, probably in relatively unimportant ways,
diff --git a/utils/bin2hex.pl b/utils/bin2hex.pl
index 0cb486e7..778b699e 100644
--- a/utils/bin2hex.pl
+++ b/utils/bin2hex.pl
@@ -26,12 +26,15 @@
 ##
 ## -----------------------------------------------------------------------
 
-eval { use bytes; }; eval { binmode STDIN; };
+eval { use bytes; };
+eval { binmode STDIN; };
 
 $len = 0;
 while ( read(STDIN,$ch,1) ) {
     $cc = ord($ch);
-    $len += printf ("%x", $cc);
+    $s = sprintf("%x", $cc);
+    print $s;
+    $len += length($s);
     if ( $len > 72 ) {
 	print "\n";
 	$len = 0;