[nss/f15: 4/4] Merge branch 'master' into f15

[Dennis Gilmore]

commit 9beb3fd35708c11411e5daf9828705815b3bfc39
Merge: 8ff9d8e 321ca50
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Fri May 20 09:11:12 2011 -0500

    Merge branch 'master' into f15

 nss-703658.patch |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 nss.spec         |   14 ++++++++++++--
 2 files changed, 59 insertions(+), 2 deletions(-)
---