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

[Robert Scheck]

commit bd71e88a87c9478bedd3215cfe6fac81f5e42020
Merge: 280cb08 e9317b0
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Sep 18 14:16:41 2011 +0200

    Merge remote branch 'origin/master' into el5

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