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

[Elio Maldonado]

commit 265cca6e24511b6fa048efd3dc0a78ae93cf9e8f
Merge: e9dcc6e 86bbc61
Author: Elio Maldonado Batiz <emaldona at redhat.com>
Date:   Fri Mar 9 10:47:25 2012 -0800

    Merge branch 'master' into f17

 nss-util.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---