[nss/f12/master: 14/14] Merge branch 'f13' into f12

[Elio Maldonado]

commit c1dd8ec026cf04f8a5bbb67bbda758d291c1576c
Merge: 6f23c57 6b07fe8
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Sep 15 12:45:29 2010 -0700

    Merge branch 'f13' into f12

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