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

[Nalin Dahyabhai]

commit 663bec79443655426ab563512774c31f30d8052b
Merge: 9b6bd09 b44f18e
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date:   Fri Dec 16 11:54:12 2011 -0500

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

 .gitignore      |    2 ++
 certmonger.spec |   10 +++++++++-
 sources         |    4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)
---