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

[odysseus]

commit f788b5865157aeebfacc6902c27a0151471f21ef
Merge: 5e49927 627c828
Author: Mattia Meneguzzo <odysseus at fedoraproject.org>
Date:   Sat May 26 10:22:39 2012 +0200

    Merge branch 'master' into f17

 sources      |    2 +-
 zukitwo.spec |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---