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

[Elio Maldonado]

commit e2b165ac8369f52f1f39a3aaede0917c3ccebe81
Merge: e65d5fc f119b17
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Oct 4 11:48:03 2010 -0700

    Merge branch 'f13' into f12

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