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

[Robert Scheck]

commit 04800588e689b677ce3880088a7ffb982d998aaa
Merge: d1d86a5 f2b94c3
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jul 10 13:21:47 2011 +0200

    Merge remote branch 'origin/master' into el4

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