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

[Elio Maldonado]

commit c0840bb6aec9446ccaedc91cfd4c494c17051bda
Merge: 91d58b5 33d3470
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu Oct 7 09:09:35 2010 -0700

    Merge branch 'f13' into f12

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