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

[odysseus]

commit 37dd597e2871dcf05767720c31a8d39d1f33968c
Merge: 1021f7a 7d8fe44
Author: Mattia Meneguzzo <odysseus at fedoraproject.org>
Date:   Tue Jun 5 21:59:03 2012 +0200

    Merge branch 'master' into f17

 zukitwo-20120602-fonts.patch |    6 +++---
 zukitwo.spec                 |   10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)
---