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

[Elio Maldonado]

commit b99b3bb5ebcbe5c446aa861f85d662613e0df766
Merge: 85f847e 82420a2
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Mar 9 15:35:18 2012 -0800

    Merge branch 'master' into f17

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