[nss-util/f12/master: 8/8] Merge branch 'master' into f12

[Elio Maldonado]

commit 4fb316c2ff6b88538109f2ce2484dea806b80076
Merge: 4fc183d cf2604c
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Aug 27 14:43:55 2010 -0700

    Merge branch 'master' into f12

 .gitignore    |    2 +-
 nss-util.spec |   22 ++++++++++++----------
 sources       |    2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)
---