[nspr/f13/master: 5/5] Merge branch 'master' into f13

[Elio Maldonado]

commit b4568b6bb6bb9832f775948c2bfc50350c8f16ef
Merge: 570a4d5 4fcfff3
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Aug 25 13:59:46 2010 -0700

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	nspr.spec
    	sources

 .gitignore |    2 +-
 nspr.spec  |    9 ++++++---
 sources    |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
---