[gnu-free-fonts/f14/master: 3/3] Merge branch 'master' into f14

[Jon Ciesla]

commit 39a5de42a54767f2564153c84e9ee5634d35e936
Merge: f9b7008 229d001
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Tue Oct 5 12:00:10 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	gnu-free-fonts.spec

 .gitignore          |    1 +
 gnu-free-fonts.spec |   11 ++++++++---
 sources             |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---