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

[Elio Maldonado]

commit 8b5f3e43f0940a5969f012c847dd41fb7ce72261
Merge: 9beb3fd e2ce6e0
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Jul 22 08:42:17 2011 -0700

    Merge branch 'master' into f15

 nss-646045.patch |   34 ++++++++++++++++++++++++++++++++++
 nss.spec         |   29 +++++++++++++++++++++++++++--
 sources          |    2 +-
 3 files changed, 62 insertions(+), 3 deletions(-)
---