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

[odysseus]

commit be06357f8b0cbc4c3913cf7396cefe65a6107b71
Merge: 37dd597 c4d2a96
Author: Mattia Meneguzzo <odysseus at fedoraproject.org>
Date:   Sat Jun 9 10:14:54 2012 +0200

    Merge branch 'master' into f17

 sources                           |    2 +-
 zukitwo-20120602-fonts.patch      |   11 -----------
 zukitwo-20120607-rmnotavail.patch |   32 ++++++++++++++++++++++++++++++++
 zukitwo.spec                      |   16 +++++++++++-----
 4 files changed, 44 insertions(+), 17 deletions(-)
---