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

[Elio Maldonado]

commit 6799727d7b74c6a53219a41982c6680aa739fe3b
Merge: e620cdd 768a0d5
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Nov 5 09:00:34 2010 -0700

    Merge branch 'f14' into f13

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