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

[odysseus]

commit e184ac37baf151b2804cb108cdc5bd78d657dc55
Merge: 5cbd700 6072cf5
Author: Mattia Meneguzzo <odysseus at fedoraproject.org>
Date:   Sat Aug 4 09:59:07 2012 +0200

    Merge branch 'master' into f17

 zukitwo.spec |   45 +++++++++++++++++++++++++--------------------
 1 files changed, 25 insertions(+), 20 deletions(-)
---