[cacti/el4: 59/62] Merge branch 'master' into el6

[Ken Dreyer]

commit c70dd17de2c7d6813a823df48f78708dec4082ce
Merge: a939e48 355ddff
Author: Ken Dreyer <ktdreyer at ktdreyer.com>
Date:   Thu Oct 27 12:40:14 2011 -0600

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	cacti.spec
    	sources

 .gitignore |    3 ++-
 cacti.spec |   12 +++++++++++-
 sources    |    2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)
---