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

[Elio Maldonado]

commit 43ee0dde79e5c7525be6673d031ffb8ee531e539
Merge: 98913cd cb9c797
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu Sep 30 15:16:53 2010 -0700

    Merge branch 'f14' into f13

 nss.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---