[certmonger/f12/master: 11/11] Merge remote branch 'origin/master' into f12/master

[Nalin Dahyabhai]

commit c4757cc6e2851f950399f60743aeee0537326b5e
Merge: 37f4387 6f0969c
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Fri Aug 13 14:50:46 2010 -0400

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

 .gitignore      |    7 +++++++
 certmonger.spec |   42 ++++++++++++++++++++++++++++++++++++++++--
 sources         |    2 +-
 3 files changed, 48 insertions(+), 3 deletions(-)
---