[nss-util/f18: 3/3] Merge branch 'master' into f18

[Elio Maldonado]

commit 539ce16d6389c10a26cd09149dde3ecbb0716e90
Merge: a7b6702 9a93b7b
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Dec 30 17:19:09 2012 -0800

    Merge branch 'master' into f18
    
    - cherry-pick from master

 nss-util.spec |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)
---