[ripright/f19: 2/2] Merge branch 'master' into f19

[Christopher Meng]

commit 71871d776cd0b1fde255dbd3093af5604eccc909
Merge: ea48417 2a892c3
Author: Christopher Meng <i at cicku.me>
Date:   Sat Feb 22 17:24:36 2014 +0800

    Merge branch 'master' into f19

 ripright.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---