[abattis-cantarell-fonts/f14: 7/7] Merge branch 'f15' into f14

[Ian Weller]

commit 1dee75842cefff91792faaa7661323837b355a1b
Merge: e47057d 4607260
Author: Ian Weller <ian at ianweller.org>
Date:   Fri Jul 29 22:37:21 2011 -0400

    Merge branch 'f15' into f14
    
    Conflicts:
    	.gitignore
    	abattis-cantarell-fonts.spec
    	sources

 .gitignore                   |    3 +++
 abattis-cantarell-fonts.spec |   21 +++++++++++++--------
 sources                      |    2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)
---