[pen/el6: 2/2] Merge branch 'master' into el6

[Christopher Meng]

commit 2f7a3f74a60a96a31e638d0a171d8277fc7e6e4e
Merge: 31fb0d6 527aa9c
Author: Christopher Meng <i at cicku.me>
Date:   Thu Aug 14 16:34:23 2014 +0800

    Merge branch 'master' into el6

 .gitignore |    1 +
 pen.spec   |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---