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

[Andrew Elwell]

commit e4eecab6e1fc0131a36bc36f44e4955ad07d1b8d
Merge: d0ae619 bfcd5c7
Author: Andrew Elwell <Andrew.Elwell at gmail.com>
Date:   Wed Feb 1 09:13:20 2012 +0100

    Merge branch 'master' into el6

 .gitignore  |    1 +
 libfap.spec |    8 +++++++-
 sources     |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---