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

[Peter Gordon]

commit 3ad372771404eb916942d3f3aa887e0cee75a66e
Merge: 81bf4ea f466034
Author: Peter Gordon <peter at thecodergeek.com>
Date:   Sat Mar 10 21:24:05 2012 -0800

    Remerge with master.

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