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

[Elio Maldonado]

commit 51c4dcf0e035a35202ed3e7ace1082ae021c1b70
Merge: 19fee62 39b507e
Author: Elio Maldonado Batiz <emaldona at redhat.com>
Date:   Tue Mar 27 15:26:25 2012 -0700

    Merge branch 'master' into f17

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