[certmonger/f14/master: 6/6] Merge remote-tracking branch 'origin/master' into f14/master

[Nalin Dahyabhai]

commit cc700f5ec8135cd68eb646a056ab72b1df01edb6
Merge: 3b70bc4 a1bb00a
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Wed Mar 2 16:20:39 2011 -0500

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

 .gitignore      |    4 ++++
 certmonger.spec |   51 ++++++++++++++++++++++++++++++++++++++++++++++++---
 sources         |    3 ++-
 3 files changed, 54 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index b21638d,846b488..a7d3318
--- a/.gitignore
+++ b/.gitignore
@@@ -8,4 -8,8 +8,8 @@@ certmonger-0.23.tar.g
  certmonger-0.24.tar.gz
  certmonger-0.26.tar.gz
  certmonger-0.28.tar.gz
 -/certmonger-0.30.tar.gz
 -/certmonger-0.32.tar.gz
 -/certmonger-0.34.tar.gz
 -/certmonger-0.35.tar.gz
 -/certmonger-0.35.1.tar.gz
 +certmonger-0.30.tar.gz
++certmonger-0.32.tar.gz
++certmonger-0.34.tar.gz
++certmonger-0.35.tar.gz
++certmonger-0.35.1.tar.gz