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

[Elio Maldonado]

commit df86ec620e1d7723da9bdf793b38cb45eedf2dec
Merge: 34b1c4e cf2604c
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Aug 27 11:23:06 2010 -0700

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	nss-util.spec
    	sources

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