[certmonger/f15: 5/5] Merge remote-tracking branch 'origin/master' into f15

[Nalin Dahyabhai]

commit 3b4ebe29abfb01031c750c42310c4a83091dcaf2
Merge: 663bec7 f3bac67
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Tue Mar 6 13:00:16 2012 -0500

    Merge remote-tracking branch 'origin/master' into f15

 .gitignore      |    6 ++++++
 certmonger.spec |   39 +++++++++++++++++++++++++++++++++++++--
 sources         |    4 ++--
 3 files changed, 45 insertions(+), 4 deletions(-)
---