[libfap/el6: 5/5] Merge branch 'master' into el6

[Andrew Elwell]

commit d0ae619b008f94e970b4429e905e5b982aa1fc65
Merge: 760c38a 8f7964d
Author: Andrew Elwell <Andrew.Elwell at gmail.com>
Date:   Tue Aug 30 14:25:12 2011 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	libfap.spec
    	sources

 .gitignore  |    2 ++
 libfap.spec |   14 ++++++++++++--
 sources     |    2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)
---