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

[Elio Maldonado]

commit ebac350c8b873a491b717403ef60cd31cf2f836a
Merge: 9c7cfa3 c4f8125
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Sep 11 16:19:26 2010 -0700

    Merge branch 'f13' into f14

 nss.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---