[nss/f15: 2/2] Merge branch 'f16' into f15

[Elio Maldonado]

commit 2c824c977a20c09be1aacea7eef7cc9f48310e51
Merge: 7ad4618 40928cb
Author: Elio Maldonado <emaldonado at localhost.localdomain>
Date:   Fri Jan 6 17:43:52 2012 -0800

    Merge branch 'f16' into f15

 nss-ssl-cbc-random-iv-off-by-default.patch |   25 +++++++++++++++++++++++++
 nss.spec                                   |    8 +++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---