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

[odysseus]

commit 54ad9ccad254db7f7524991fc068549a4fa4839a
Merge: 67a262d 5699fc4
Author: Mattia Meneguzzo <odysseus at fedoraproject.org>
Date:   Sat Jul 7 08:24:05 2012 +0200

    Merge branch 'master' into f17

 sources                           |    2 +-
 zukitwo-20120612-rmnotavail.patch |   32 --------------------------------
 zukitwo-20120702-rmnotavail.patch |   32 ++++++++++++++++++++++++++++++++
 zukitwo.spec                      |    7 +++++--
 4 files changed, 38 insertions(+), 35 deletions(-)
---