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

[Elio Maldonado]

commit bb50264ac8d1096ab2d394cb67236b77bbc4f2bb
Merge: b99b3bb 6aaff3f
Author: Elio Maldonado Batiz <emaldona at redhat.com>
Date:   Tue Mar 27 15:46:54 2012 -0700

    Merge branch 'master' into f17

 nspr.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---