[zukitwo/f17: 2/2] Merge branch 'master' into f17

[odysseus]

commit 1021f7a0bfa97a4c1d77015537465b3fd19e9520
Merge: 50f64a8 7fc7ece
Author: Mattia Meneguzzo <odysseus at fedoraproject.org>
Date:   Tue Jun 5 06:29:40 2012 +0200

    Merge branch 'master' into f17

 zukitwo-20120602-fonts.patch |   11 +++++++++++
 zukitwo.spec                 |   13 +++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
---