[chmlib/el5/master: 13/13] Merge branch 'master' into el5/master

[Peter Lemenkov]

commit dc83c8c46d02ac3010f0333753825ce09b5c2681
Merge: c2e58c5 3f88070
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Aug 26 17:13:20 2010 +0400

    Merge branch 'master' into el5/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(-)
---