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

[odysseus]

commit 0559d7ef6cc1e03a1d71ecab2adcb81c2903dd01
Merge: 54ad9cc 6acab8f
Author: Mattia Meneguzzo <odysseus at fedoraproject.org>
Date:   Sun Jul 15 10:03:11 2012 +0200

    Merge branch 'master' into f17

 sources                                            |    2 +-
 ...vail.patch => zukitwo-20120708-rmnotavail.patch |   12 ++--
 zukitwo.spec                                       |   51 ++++++++++---------
 3 files changed, 34 insertions(+), 31 deletions(-)
---