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

[Nick Bebout]

commit 1e135a1322d46cdabadde6e7bef240120c6891c0
Merge: 944e2ec 78a4d53
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sat Apr 21 17:00:52 2012 -0500

    Merge branch 'master' into f16

 .gitignore      |    1 +
 sks-build.patch |   24 ++++++++++++++++++++++++
 sks.spec        |   13 ++++++++-----
 sources         |    2 +-
 4 files changed, 34 insertions(+), 6 deletions(-)
---