[kchmviewer/f13/master: 9/9] Merge branch 'master' into f13

[cheeselee]

commit 9ff0b6ffeaed58fc18ad1bd4202fc92e75b88ed4
Merge: 6608632 41cf51a
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Tue Oct 12 01:16:36 2010 +0800

    Merge branch 'master' into f13

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