[abattis-cantarell-fonts/f15/master: 5/5] Merge branch 'master' into fc15

[Cosimo Cecchi]

commit 5d56f5693fa489ae4f65aca05ef6ccce558594a7
Merge: 108ed51 88a9062
Author: Cosimo Cecchi <cosimoc at gnome.org>
Date:   Fri Feb 18 16:50:48 2011 -0500

    Merge branch 'master' into fc15

 abattis-cantarell-fonts.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---