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

[fantom]

commit 23f5a696c9d730fe556c5f93cbe248ebcf669b01
Merge: 855a71b ed9e9f9
Author: Matthieu Saulnier <fantom at fedoraproject.org>
Date:   Fri Sep 21 22:52:08 2012 +0200

    Merge branch 'master' into f17

 qrencode.spec |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)
---