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

[Robert Scheck]

commit 84f9d80988909bad9f23a353d8938ba9ec842180
Merge: d00f298 942aeef
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 31 02:41:09 2010 +0200

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

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