Imported Upstream version 2.0.2
Imported Upstream version 2.1
Merge tag 'upstream/2.1': Used upstream version for all conflicts.

Upstream version 2.1

Conflicts:
	ChangeLog
	Makefile
	acctproc.c
	atop.c
	deviate.c
	man/atop.1
	man/atoprc.5
	man/atopsar.1
	parseable.c
	photoproc.h
	photosyst.c
	photosyst.h
	showlinux.c
	showlinux.h
	showsys.c
	version.h
Refreshed.
Refreshed.
Refreshed.
Refreshed.
Refreshed.
Changelog for refreshed patches.

Git-Dch: no