[mod_fcgid/f13/master: 4/4] Merge remote branch 'origin/master' into f13/master

[Paul Howarth]

commit 6dc88592c8f0ea926a9d5c75bf66fb2271b7d4e4
Merge: 6aea2f6 b969a41
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Nov 5 14:52:52 2010 +0000

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore

 .gitignore     |    2 +-
 mod_fcgid.spec |   38 +++++++++++++++++++++++++++-----------
 sources        |    2 +-
 3 files changed, 29 insertions(+), 13 deletions(-)
---