[atop/el6: 5/5] Merge branch 'master' into el6

[Jon Ciesla]

commit a5f564f07981270092d67c90b812a2ec0039cd72
Merge: d96abab b0b2985
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Nov 21 10:07:49 2011 -0600

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore   |    2 +-
 atop.d       |   10 ++++----
 atop.service |    9 ++++++++
 atop.spec    |   64 ++++++++++++++++++++++++++++++++++++++++++---------------
 sources      |    2 +-
 5 files changed, 63 insertions(+), 24 deletions(-)
---
diff --cc .gitignore
index f7a6120,6956a9d..1fe98c5
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--atop-1.23.tar.gz
 -/atop-1.26.tar.gz
++atop-1.26.tar.gz