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

[Elio Maldonado]

commit 690f79c8fa468fd483e110d794bbdf0fda09049b
Merge: 0ade450 5cb30e2
Author: Elio Maldonado <emaldona at localhost.localdomain>
Date:   Mon Aug 30 16:22:04 2010 -0700

    Merge branch 'master' into f14

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