[nss-util/f16: 5/5] Merge branch 'master' into f16

[Elio Maldonado]

commit 4d10c3974477f9802cf39dd883d15757f13fbbfb
Merge: 43a420f 41d1170
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Nov 7 08:33:25 2011 -0800

    Merge branch 'master' into f16

 .gitignore    |    2 +-
 nss-util.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---