Fix the coloring bug
Merge branch 'my-rpi' into laptop

Conflicts:
	sysstat/sysstat2.c