[libisofs/el4/master: 8/8] Merge remote branch 'origin/master' into el4

[Robert Scheck]

commit c0017a7bfdf9b061d638d55e5889a49929a24da7
Merge: 4506323 942aeef
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 31 02:44:10 2010 +0200

    Merge remote branch 'origin/master' into el4
    
    Conflicts:
    	.gitignore
    	libisofs.spec
    	sources

 .gitignore    |    2 +-
 libisofs.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---