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

[Robert Scheck]

commit b79b08fb2d263d4012d19e26f2fa1fdd2a6dd269
Merge: b23ed04 ae6ba0a
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue May 17 01:01:23 2011 +0200

    Merge remote branch 'origin/master' into f13

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