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

[cheeselee]

commit 86ea8b9015844acb4b39161e724c7f073a97b817
Merge: 398d001 41cf51a
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Tue Oct 12 01:17:49 2010 +0800

    Merge branch 'master' into f12

 kchmviewer.spec |   81 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 sources         |    2 +-
 2 files changed, 75 insertions(+), 8 deletions(-)
---