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

[Robert Scheck]

commit 23198f8346e005fedc77cda15e160e9a0bf11d61
Merge: 7e16fe7 e48f535
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Feb 28 01:07:35 2011 +0100

    Merge remote branch 'origin/master' into f13

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