[gitweb-caching/f13/master: 4/4] Merge branch 'master' into f13

[John 'Warthog9' Hawley]

commit a37594e833d1032f05bb5d85230796c99a288adf
Merge: 1ccfbf4 8fa7c0b
Author: John 'Warthog9' Hawley <warthog9 at eaglescrag.net>
Date:   Tue Sep 28 15:10:29 2010 -0700

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    
    conflict 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(-)
---