[chmlib/f12/master: 4/4] Merge branch 'master' into f12/master

[Peter Lemenkov]

commit 6423e9453f6b4551c8989393382884acb41a750c
Merge: 50c071c 3f88070
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Aug 26 17:11:11 2010 +0400

    Merge branch 'master' into f12/master

 ...x-integer-types-problem-by-Goswin-von-Bre.patch |   72 ++++++++++++++++++++
 ...ract_chmLib-confusing-empty-files-with-di.patch |   39 +++++++++++
 chmlib-chm_lib-fix_for_multiarch.diff              |   46 -------------
 chmlib.spec                                        |   60 +++++++++-------
 4 files changed, 145 insertions(+), 72 deletions(-)
---