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

[Robert Scheck]

commit fef61778a668d6a6139cfdfe3284711837605e19
Merge: 0480058 e9317b0
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Sep 18 14:17:19 2011 +0200

    Merge remote branch 'origin/master' into el4

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