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

[odysseus]

commit 5cbd70012f475cb5d524cecba38098d7328d35b8
Merge: 0559d7e a572b38
Author: Mattia Meneguzzo <odysseus at fedoraproject.org>
Date:   Sun Jul 22 12:15:54 2012 +0200

    Merge branch 'master' into f17

 zukitwo.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---