[qrencode/f15: 3/3] Remerge with master.

[Peter Gordon]

commit ccfd7444c44238eab1240badf1f89d24ee0d20f7
Merge: 1b99f50 f466034
Author: Peter Gordon <peter at thecodergeek.com>
Date:   Sun Mar 11 11:28:24 2012 -0700

    Remerge with master.

 qrencode-fix-LIBPTHREAD-macro.patch |    2 +-
 qrencode.spec                       |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
---