[mod_fcgid/f12/master: 9/9] Merge remote branch 'origin/master' into f12/master

[Paul Howarth]

commit e99f45171bd81a49448c4becf7ad05a44ef0fdfb
Merge: 8b43e2a b969a41
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Nov 5 16:47:12 2010 +0000

    Merge remote branch 'origin/master' into f12/master
    
    Conflicts:
    	.gitignore
    	mod_fcgid.spec
    	sources

 .gitignore                      |    2 +-
 mod_fcgid-2.3.4-svn827039.patch |  548 ---------------------------------------
 mod_fcgid.spec                  |   56 +++--
 sources                         |    2 +-
 4 files changed, 34 insertions(+), 574 deletions(-)
---