[nss-util/f13/master: 4/4] Merge branch 'master' into f13

[Elio Maldonado]

commit 23be31793cb48461a4a127c8acb80586f949056e
Merge: df86ec6 abd6d61
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Aug 29 13:43:15 2010 -0700

    Merge branch 'master' into f13

 nss-nolocalsql.patch |   20 --------------------
 nss-util.spec        |   14 +++++++++-----
 2 files changed, 9 insertions(+), 25 deletions(-)
---