[ricci] Merging of branches.

[Chris Feist]

commit 57a6c12940fb628c512e73daac444af5f7c9a300
Author: Chris Feist <cfeist at redhat.com>
Date:   Wed Feb 9 14:05:28 2011 -0600

    Merging of branches.

 .gitignore |    1 +
 ricci.spec |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index db93f2c..3532e9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /ricci-0.18.3.tar.bz2
 /ricci-0.18.4.tar.bz2
 /ricci-0.18.5.tar.bz2
+/ricci-0.18.6.tar.bz2
diff --git a/ricci.spec b/ricci.spec
index fac63cf..e401e3b 100644
--- a/ricci.spec
+++ b/ricci.spec
@@ -9,8 +9,8 @@
 ###############################################################################
 
 Name: ricci
-Version: 0.18.5
-Release: 2%{?dist}
+Version: 0.18.6
+Release: 1%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga/
 Group: System Environment/Base
@@ -144,6 +144,9 @@ The Red Hat Cluster Configuration System
 %{_sbindir}/ccs
 
 %changelog
+* Wed Fed 09 2011 Chris Feist <cfeist at redhat.com> - 0.18.6-1
+- Merging in changes from other branches
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 32b4f8a..b7a928f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3fabaafb67328e3a54eb3aba3a7cfddb  ricci-0.18.5.tar.bz2
+674b6c3334a4a8ec9317d90b43110ae3  ricci-0.18.6.tar.bz2