[certmonger/f14/master: 5/5] Merge commit 'ed4ae41b22eada9050f648af4e39fe860ebbf515' into f14/master

[Nalin Dahyabhai]

commit 80e20302e41c151c59a7c8c4892150456e278cda
Merge: c7865ba ed4ae41
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Thu Sep 23 13:12:01 2010 -0400

    Merge commit 'ed4ae41b22eada9050f648af4e39fe860ebbf515' into f14/master
    
    Conflicts:
    	.gitignore
    	certmonger.spec

 certmonger.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---