[kchmviewer/el6/master: 10/10] Merge branch 'master' into el6

[cheeselee]

commit 3aa5a03290840da7854b80f471104d6c99e18611
Merge: c6dc6af 41cf51a
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Tue Oct 12 01:19:04 2010 +0800

    Merge branch 'master' into el6

 kchmviewer.spec |   73 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 66 insertions(+), 7 deletions(-)
---