[gridsite/el5: 12/12] Merge branch 'el6' into el5

[stevetraylen]

commit 432751318aafa4adc118980931b1fbe3bb42aa8b
Merge: b572b0f 78cf620
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Sun Mar 18 17:34:11 2012 +0100

    Merge branch 'el6' into el5
    
    Conflicts:
    	gridsite.spec

 .gitignore    |    2 ++
 gridsite.spec |   21 +++++++++++----------
 sources       |    2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)
---
diff --cc gridsite.spec
index eb48660,127f4e7..719756e
--- a/gridsite.spec
+++ b/gridsite.spec
@@@ -140,7 -136,7 +136,7 @@@ This package gridsite-doc, contains dev
  Group:    System Environment/Daemons
  Summary:  Run time libraries for mod_gridsite and gridsite-clients
  Version:  %{vercompat}
- Release:  2%{?dist}
 -Release:  2
++Release:  3%{?dist}
  
  %description compat
  GridSite was originally a web application developed for managing and formatting