[nspr/f18: 2/2] Merge branch 'master' into f18

[Elio Maldonado]

commit 2528b4e58ce16152f5770f4a7b9c044fc7e3d2ae
Merge: d423849 4a13437
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Feb 1 16:41:02 2013 -0800

    Merge branch 'master' into f18
    
    - Update to NSPR_4_9_5_RTM

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