[pigz/el6: 4/4] Merge branch 'master' into el6

[Orion Poplawski]

commit 7f33dac7736129ecd6aa52c35db0fee3645d6587
Merge: 6afd4df e7161b5
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Mar 14 09:06:13 2012 -0600

    Merge branch 'master' into el6

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