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

[odysseus]

commit 67a262dec64556a906393a1bd8f752f10bdaa802
Merge: be06357 0fff88a
Author: Mattia Meneguzzo <odysseus at fedoraproject.org>
Date:   Mon Jun 18 23:34:10 2012 +0200

    Merge branch 'master' into f17

 sources                                            |    2 +-
 ...vail.patch => zukitwo-20120612-rmnotavail.patch |    0
 zukitwo.spec                                       |    7 +++++--
 3 files changed, 6 insertions(+), 3 deletions(-)
---