[pigz/f17: 3/3] Merge remote-tracking branch 'origin/f16' into f17

[drago01]

commit e7161b5c28abc8b8b29f159a68b845604127609c
Merge: e898bec 47d0912
Author: Adel Gadllah <adel.gadllah at gmail.com>
Date:   Wed Mar 14 09:41:03 2012 +0100

    Merge remote-tracking branch 'origin/f16' into f17
    
    Conflicts:
    	.gitignore
    	pigz.spec
    	sources

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