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

[Robert Scheck]

commit 280cb08cf5329dcedece52d418fe081ccca4980b
Merge: be431a8 f2b94c3
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jul 10 13:21:21 2011 +0200

    Merge remote branch 'origin/master' into el5

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