[gitweb-caching/el6/master: 7/7] Merge branch 'master' into el6

[John 'Warthog9' Hawley]

commit a57327b5a196e5047a2059aca33eb1fb198b1a6c
Merge: dc887e3 8fa7c0b
Author: John 'Warthog9' Hawley <warthog9 at eaglescrag.net>
Date:   Tue Sep 28 15:06:25 2010 -0700

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	gitweb-caching.spec
    	sources
    
    all conflicts resolved

 .gitignore                                         |    3 ++-
 ...a7869936599175d70a903e1a9adeacd62c04.tar.gz.asc |    7 +++++++
 ...8b5d1748b0174fb7014651f0f91de3b4c05a.tar.gz.asc |    7 +++++++
 gitweb-caching.spec                                |   18 +++++++++++++++---
 sources                                            |    2 +-
 5 files changed, 32 insertions(+), 5 deletions(-)
---