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

[fantom]

commit 855a71bf61d128524021d59400d8d0af32633c81
Merge: 8afcb7a 6a96685
Author: Matthieu Saulnier <fantom at fedoraproject.org>
Date:   Thu Aug 16 21:59:47 2012 +0200

    Merge branch 'master' into f17

 qrencode.spec |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)
---