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

[fantom]

commit ebd2bd99f39ee1c857d2c30adc7bcdcdbb723399
Merge: 17b81ec ed9e9f9
Author: Matthieu Saulnier <fantom at fedoraproject.org>
Date:   Fri Sep 21 22:54:36 2012 +0200

    Merge branch 'master' into f16

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