[chmlib/el4/master: 12/12] Merge branch 'master' into el4/master

[Peter Lemenkov]

commit fac5068e8f4e1d931dc4a6cde331969754421b50
Merge: da7a360 3f88070
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Aug 26 17:14:34 2010 +0400

    Merge branch 'master' into el4/master
    
    Conflicts:
    	chmlib.spec

 ...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                                        |   63 ++++++++++-------
 4 files changed, 148 insertions(+), 72 deletions(-)
---