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

[Peter Gordon]

commit c23270ceb66b44c4706c1344efd0689f226f359f
Merge: 2fdc06d f466034
Author: Peter Gordon <peter at thecodergeek.com>
Date:   Sat Mar 10 21:11:00 2012 -0800

    Remerge with master.

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