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

[Elio Maldonado]

commit 9c7cfa3932516c381b855d8f6c8017c229cb74f2
Merge: 690f79c c953934
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Sep 7 08:19:12 2010 -0700

    Merge branch 'f13' into f14
    
    Fix unclosed comment in renegotiate-transitional.patch

 nss.spec                       |   10 ++++++----
 renegotiate-transitional.patch |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
---