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

[Elio Maldonado]

commit eee1d10b0561e899a7ecbf5bebe2a7a1a4d0f21d
Merge: 3e4d96d 62fc05e
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Jun 19 21:22:37 2013 -0700

    Merge branch 'master' into f19

 nspr-config.xml |  127 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 nspr.spec       |   26 ++++++++++-
 2 files changed, 151 insertions(+), 2 deletions(-)
---