[cacti/el4: 58/62] Merge branch 'master' into el5

[Ken Dreyer]

commit 3336efd1735df7b3904ccdd08f7897a8950edad6
Merge: d154b2d 355ddff
Author: Ken Dreyer <ktdreyer at ktdreyer.com>
Date:   Thu Oct 27 12:37:56 2011 -0600

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	cacti.spec

 .gitignore |    2 +-
 cacti.spec |   12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)
---