[sks/f16: 2/2] Merge branch 'master' into f16

[Nick Bebout]

commit d966b44d4a3e573b7a7ba1b4c0d4152c202445d1
Merge: 3ba51b1 863ce16
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Jan 24 20:55:51 2012 -0600

    Merge branch 'master' into f16

 sks-1.1.1-libdb.patch => sks-libdb4.8.patch |    2 +-
 sks.spec                                    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---