[nss/f18: 2/2] Merge branch 'master' into f18

[Elio Maldonado]

commit 966b5e412ffa914dd444b44bc1efc1dbc95ab962
Merge: cc8dc43 96957e8
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Feb 4 15:43:44 2013 -0800

    Merge branch 'master' into f18

 allow-building-nss-against-older-sqlite.patch |   20 ++++++++++++++++++++
 nss.spec                                      |    8 +++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---