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

[fantom]

commit 13c58816fdc7e7a5d7e52e51605e4e27f5ad4ae2
Merge: 3ad3727 289f53f
Author: Matthieu Saulnier <fantom at fedoraproject.org>
Date:   Sat Jun 23 23:07:55 2012 +0200

    Merge branch 'master' into f16

 .gitignore    |    1 +
 qrencode.spec |   17 ++++++++++-------
 sources       |    2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)
---