[aajohan-comfortaa-fonts/el6/master: 2/2] Merge branch 'master' into el6

[Luya Tshimbalanga]

commit 1d7b670f0a14a5bee94f08239448b83eec0f803b
Merge: 6868375 ca1f141
Author: Luya Tshimbalanga <luya at kwetu.benashima.net>
Date:   Fri Dec 3 14:13:17 2010 -0800

    Merge branch 'master' into el6

 .gitignore                   |    1 +
 aajohan-comfortaa-fonts.spec |    9 ++++++---
 sources                      |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---