[glusterfs/el5: 4/4] Merge remote-tracking branch 'origin/el6' into el5

[Kaleb S. KEITHLEY]

commit e8e3319807a5e3d37635fa2d1c81fe77074ba89d
Merge: 56f64b9 c7462ec
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Thu Jul 5 16:11:06 2012 -0400

    Merge remote-tracking branch 'origin/el6' into el5

 .gitignore     |    1 +
 glusterfs.spec |  159 +++++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 125 insertions(+), 35 deletions(-)
---
diff --cc glusterfs.spec
index c48c595,2c3f78c..e4f714e
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@@ -304,8 -325,9 +325,9 @@@ touch %{buildroot}%{_sharedstatedir}/gl
  %{_libdir}/*.so.*
  %{_sbindir}/glusterfs*
  %{_libexecdir}/glusterfs
 -#%{_mandir}/man8/*gluster*.8* # man page install commented out in 3.3.0 source
 +# %{_mandir}/man8/*gluster*.8*
  %dir %{_localstatedir}/log/glusterfs
+ %dir %{_sharedstatedir}/glusterd
  %if 0%{!?_without_rdma:1}
  %exclude %{_libdir}/glusterfs/%{version}/rpc-transport/rdma*
  %endif