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

[Elio Maldonado]

commit 9b182d22eda484f950e469aa2ce88e39cf633d3c
Merge: 96702ba ebb7b25
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Aug 10 09:29:36 2010 -0700

    Merge branch 'master' into f13

 .gitignore |    2 +-
 nss.spec   |   10 ++++++++--
 sources    |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---