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

[Nick Bebout]

commit 730172e9abf379b5367e412dce4c167506c17552
Merge: d0353c4 bb5198d
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Dec 13 17:54:38 2011 -0600

    Merge branch 'master' into f16
    
    Conflicts:
    	sks.spec

 .gitignore |    1 +
 sks.spec   |   13 ++++++++-----
 sources    |    2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
---