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

[Ricardo Rocha]

commit 59522b28de8d1293f83e3326f6f72c96581db8ee
Merge: 4327513 98ec13b
Author: rochaporto <rocha.porto at gmail.com>
Date:   Thu Jul 19 11:48:38 2012 +0200

    Merge branch 'el6' into el5

 .gitignore                    |    1 +
 cgi-bin-location-1.7.21.patch |   32 ++++++++++++++++++++++++++++++++
 gridsite.spec                 |   31 +++++++++++++++++++++++++++++--
 sources                       |    3 +--
 4 files changed, 63 insertions(+), 4 deletions(-)
---