[pigz/el5: 3/3] Merge branch 'master' into el5 Update to 2.2.5

[Orion Poplawski]

commit 885b63b5f87fece9dc23945625ec7077fe7f4d2b
Merge: 6eefde9 a0f981b
Author: Orion Poplawski <orion at nwra.com>
Date:   Wed Aug 1 10:53:36 2012 -0600

    Merge branch 'master' into el5
    Update to 2.2.5

 .gitignore               |    4 +---
 pigz-2.2.4-ldflags.patch |   12 ++++++++++++
 pigz.spec                |   19 +++++++++++++++++--
 sources                  |    2 +-
 4 files changed, 31 insertions(+), 6 deletions(-)
---