[pigz/el5: 5/5] Merge branch 'el6' into el5

[Orion Poplawski]

commit 6eefde9e31a4a3191612fd2f918a1ffa44ab21ac
Merge: 1525199 7f33dac
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Mar 14 09:06:51 2012 -0600

    Merge branch 'el6' into el5

 .gitignore |    1 +
 pigz.spec  |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---