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

[Ken Dreyer]

commit ea94628ff0457bd645884695a94d2c92f938b78d
Merge: 2e6f045 355ddff
Author: Ken Dreyer <ktdreyer at ktdreyer.com>
Date:   Thu Oct 27 12:32:41 2011 -0600

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

 .gitignore |    3 ++-
 cacti.spec |   13 ++++++++++++-
 sources    |    2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)
---
diff --cc cacti.spec
index 30f1951,a84fd55..4e5a1be
--- a/cacti.spec
+++ b/cacti.spec
@@@ -105,6 -105,16 +105,17 @@@ f
  %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
  
  %changelog
++=======
+ * Thu Oct 27 2011 Ken Dreyer <ktdreyer at ktdreyer.com> - 0.8.7h-1
+ - New upstream release.
+ - Remove upstream'd mysql patch.
+ 
+ * Mon Aug 08 2011 Jon Ciesla <limb at jcomserv.net> - 0.8.7g-3
+ - Patch for MySQL 5.5, BZ 728513.
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.7g-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Mon Jul 12 2010 Mike McGrath <mmcgrath at redhat.com> 0.8.7g-1
  - Upstream released new version