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

[odysseus]

commit 07e50b266cadadda630c6ab5808533a371f49546
Merge: 18f557c e5b30eb
Author: Mattia Meneguzzo <odysseus at fedoraproject.org>
Date:   Sun Aug 5 09:01:18 2012 +0200

    Merge branch 'master' into f17

 zukitwo.spec |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)
---