Merge branch 'master' into newlib

 Conflicts:
	pgrep.c
	proc/sysinfo.c
	ps/output.c
	skill.c
	top/top.c
	top/top.h
	w.c

diff --cc Makefile.am
Simple merge

diff --cc configure.ac
Simple merge

diff --cc free.c
Simple merge

diff --cc pidof.c
index b26b8df668d6e39c9370a7c2d220056d54f3300c,8712d113621522e744b0379cc46af615c19a20a9..9e53393c455a42505a31553da5ecf8879ff29c78
--- 1/pidof.c
--- 2/pidof.c
+++ b/pidof.c
@@@ -104,10 -101,10 +104,10 @@@ static char *get_basename (char *filena
  
  static char *pid_link (pid_t pid, const char *base_name)
  {
 -      char link [PROCPATHLEN];
 +      char link [1000];
        char *result;
-       int path_alloc_size;
-       int len;
+       ssize_t path_alloc_size;
+       ssize_t len;
  
        snprintf(link, sizeof(link), "/proc/%d/%s", pid, base_name);
  

diff --cc ps/common.h
Simple merge

diff --cc ps/global.c
Simple merge

diff --cc ps/parser.c
Simple merge

diff --cc ps/sortformat.c
Simple merge

diff --cc sysctl.c
Simple merge

diff --cc watch.c
Simple merge