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

[Nalin Dahyabhai]

commit fa170280ef9e0a1bc075420123d7532f830b1f4b
Merge: 0de107a ed4ae41
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Thu Sep 23 13:12:37 2010 -0400

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

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