[nspr/f12/master: 7/7] Merge branch 'master' into f12

[Elio Maldonado]

commit 9d8b7432f70b6745e5a01618ac32e73ba0a9a298
Merge: 597cee9 4fcfff3
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Aug 25 14:13:17 2010 -0700

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

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