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

[Christopher Meng]

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

    Merge branch 'master' into el6

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