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

[Christopher Meng]

commit e5e5a1f465d57093b645ec3691bbfd140ce0c1c4
Merge: fc63628 2d40b64
Author: Christopher Meng <i at cicku.me>
Date:   Mon Jan 27 15:18:39 2014 +0800

    Merge branch 'master' into el6

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