[cantarell-fonts: 24/24] Merge branch 'combined-sfd'

[Jakub Steiner <jimmac src gnome org>]

commit 37f9b5f466154ad27ed7cef516e9eaaea416e041
Merge: 0d7dee7 826081b
Author: Jakub Steiner <jimmac gmail com>
Date:   Wed Jan 12 14:25:01 2011 +0100

    Merge branch 'combined-sfd'

 src/Cantarell-Bold.sfd             |    8 +-
 src/Cantarell-BoldOblique.sfd      |24061 +++++++++++++++++++-----------------
 src/Cantarell-Oblique.sfd          |   10 +-
 src/Cantarell-Regular-Combined.sfd |14170 +++++++++++++++++++++
 src/Cantarell-Regular-Spiro.sfd    |12038 ------------------
 src/Cantarell-Regular.sfd          |12322 ------------------
 ttf/Cantarell-Bold.ttf             |  Bin 49276 -> 58564 bytes
 ttf/Cantarell-BoldOblique.ttf      |  Bin 52200 -> 61532 bytes
 ttf/Cantarell-Oblique.ttf          |  Bin 50068 -> 59356 bytes
 ttf/Cantarell-Regular.ttf          |  Bin 47504 -> 43116 bytes
 10 files changed, 26952 insertions(+), 35657 deletions(-)
---