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

[Robert Scheck]

commit 7e07a8a78fa6fb5dbe06c19059d1f165a5d0c378
Merge: bd71e88 ccda7ab
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Oct 8 14:08:46 2011 +0200

    Merge remote branch 'origin/master' into el5

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