Merge branch 'master' into core32

Conflicts:
	com32/include/netinet/in.h
	com32/include/sys/cpu.h
	dos/argv.c
	dos/malloc.c
	dos/syslinux.c
	extlinux/main.c
	libinstaller/setadv.c
	libinstaller/syslinux.h
	libinstaller/syslxint.h
	libinstaller/syslxmod.c
	linux/syslinux.c
	mtools/syslinux.c
	win32/syslinux.c

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

1 files changed, 1 insertions, 1 deletions

diff --git a/dos/perror.c b/dos/perror.c
index e6e82874..99ab2f81 100644
--- a/dos/perror.c
+++ b/dos/perror.c
@@ -3,5 +3,5 @@
 
 void perror(const char *msg)
 {
-  printf("%s: error %s\n", msg, errno);
+    printf("%s: error %s\n", msg, errno);
 }