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

[Elio Maldonado]

commit 6f23c57db3bec6e2781fa8e84d08abd926033579
Merge: 1a89336 c4f8125
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Sep 11 16:17:13 2010 -0700

    Merge branch 'f13' into f12

 nss.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---