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

[Nalin Dahyabhai]

commit 1bc3aecac2e9fcb330603ef1bc94be0b1a5f6993
Merge: ab353bb ed4ae41
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Thu Sep 23 13:13:03 2010 -0400

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

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