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

[odysseus]

commit 50f64a81c45fc4aed3c82f1b1876ffac2c31542e
Merge: f788b58 38dd085
Author: Mattia Meneguzzo <odysseus at fedoraproject.org>
Date:   Sun Jun 3 12:18:25 2012 +0200

    Merge branch 'master' into f17

 sources      |    2 +-
 zukitwo.spec |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)
---