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

[Robert Scheck]

commit 5280ba263e38fb6582e690e526241e3fedd3c5dd
Merge: 59734dc 942aeef
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 31 02:40:04 2010 +0200

    Merge remote branch 'origin/master' into f13
    
    Conflicts:
    	.gitignore
    	libisofs.spec
    	sources

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