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

[Elio Maldonado]

commit e1f0d4da32201c1dfeee97348f0b917e2e366af6
Merge: 4fb316c abd6d61
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Aug 29 13:53:21 2010 -0700

    Merge branch 'master' into f12

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