[atop/el4: 19/19] Merge branch 'el5' into el4

[Jon Ciesla]

commit 1b2079f72f437a0a9f15ee3e891689291aea01d3
Merge: 290177b a0e29b8
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Wed Oct 12 09:30:31 2011 -0500

    Merge branch 'el5' into el4
    
    Conflicts:
    	.gitignore
    	atop.d
    	atop.spec
    	sources

 .gitignore   |    3 +-
 atop.d       |   10 ++++----
 atop.service |    9 ++++++++
 atop.spec    |   63 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 sources      |    2 +-
 5 files changed, 72 insertions(+), 15 deletions(-)
---
diff --cc .gitignore
index f7a6120,f526fb7..835f781
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,2 @@@
- atop-1.23.tar.gz
+ /atop-1.26.tar.gz
 ->>>>>>> f14
++