[sfk/el6: 3/4] Merge branch 'master' into f20

[Christopher Meng]

commit b4c008ca4e790b38475615c41ea6bdcfce13da8c
Merge: 04c17e5 7970fc5
Author: Christopher Meng <i at cicku.me>
Date:   Thu Feb 5 09:08:11 2015 +0800

    Merge branch 'master' into f20

 .gitignore |    1 +
 sfk.spec   |    8 +++++++-
 sources    |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---