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

[Elio Maldonado]

commit f119b17949d32e408bfd153993b9e31eda66433d
Merge: 23be317 9b76c98
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Oct 4 11:38:17 2010 -0700

    Merge branch 'f14' into f13

 nss-util.spec |    7 +++++--
 sources       |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
---