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

[Christopher Meng]

commit cb21a4032e83c8e0eea05f92f706938725b70e9f
Merge: 2d44f63 fc91e3b
Author: Christopher Meng <rpm at cicku.me>
Date:   Fri Nov 8 20:19:59 2013 +0800

    Merge branch 'master' into el6

 .gitignore    |    4 +---
 sources       |    1 -
 sysusage.spec |    7 +++++--
 3 files changed, 6 insertions(+), 6 deletions(-)
---