[nss/f14/master: 3/3] Merge branch 'master' into f14

[Elio Maldonado]

commit 0ade450edc16c6c19c60faaf60d80d18bb2db1d1
Merge: b7d02ab 2becd41
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Aug 30 09:59:26 2010 -0700

    Merge branch 'master' into f14

 nss-nolocalsql.patch |   52 --------------------------------------------------
 nss.spec             |   17 ++++++++++-----
 2 files changed, 11 insertions(+), 58 deletions(-)
---