merge changesets 849 871 992 1126 1142 1212 1214 1215 from branches/1.2
-rw-r--r-- 107 Makefile
-rw-r--r-- 14146 cpulimit.c
drwxr-xr-x - debian