[certmonger/f13/master: 9/9] Merge remote branch 'origin/master' into f13/master

[Nalin Dahyabhai]

commit a4ffed38a5e11b7732ba12f229ea0395404766bb
Merge: b819b51 6f0969c
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Fri Aug 13 14:55:32 2010 -0400

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

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