[atop/el5: 12/12] Merge branch 'f14' into el5

[Jon Ciesla]

commit a0e29b81a989b0e9d255563d4e97dfbeef4524c2
Merge: b627f38 c664d4d
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Wed Oct 12 09:17:58 2011 -0500

    Merge branch 'f14' into el5
    
    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,6956a9d..f526fb7
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,2 @@@
--atop-1.23.tar.gz
+ /atop-1.26.tar.gz
++>>>>>>> f14