[nss/f16: 10/10] Merge branch 'f17' into f16

[Elio Maldonado]

commit 6e0c2648d1c103b886ab8dcc44ac1e0d572d2dc6
Merge: f73805a 19fee62
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Mar 10 13:24:35 2012 -0800

    Merge branch 'f17' into f16

 .gitignore |    2 +-
 sources    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---