[nss-util/f14/master: 9/9] Merge branch 'master' into f14

[Elio Maldonado]

commit d2cc2889365497a8c1b4c927c251568297ab16a1
Merge: 9b76c98 c64e7ad
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu Jan 13 14:11:19 2011 -0800

    Merge branch 'master' into f14

 .gitignore    |    2 +-
 nss-util.spec |   31 ++++++++++++++++++++++++++++---
 sources       |    2 +-
 3 files changed, 30 insertions(+), 5 deletions(-)
---