[google-droid-fonts/el6/master: 5/5] Merge branch 'master' into el6

[tremble]

commit 3f843401b4afe7f5f6927c2b90fffe07f19533ea
Merge: e2008d2 b1a0267
Author: Mark Chappell <tremble at fedoraproject.org>
Date:   Fri Oct 1 11:46:42 2010 +0200

    Merge branch 'master' into el6

 .gitignore                              |    5 +-
 google-droid-fonts-sans-fontconfig.conf |   92 +++++++++++++++++++++++++++++-
 google-droid-fonts.spec                 |   94 +++++++++++++++----------------
 sources                                 |    5 +-
 4 files changed, 144 insertions(+), 52 deletions(-)
---