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

[Robert Scheck]

commit 5b6ae4cc32a660b6871a83f0193b07598372437f
Merge: fef6177 ccda7ab
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Oct 8 14:09:16 2011 +0200

    Merge remote branch 'origin/master' into el4

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