[p7zip/el6: 8/8] Merge branch 'master' into el6

[Matthias Saou]

commit dcec53d692c45c1867c88fe1612c205751c1b461
Merge: 0ae5769 1cadb4f
Author: Matthias Saou <thias at marmotte.net>
Date:   Tue Jul 26 18:04:11 2011 +0200

    Merge branch 'master' into el6

 .gitignore                                         |    3 +-
 p7zip.spec                                         |   85 ++++++++++-------
 p7zip_9.13-norar.patch                             |  102 --------------------
 p7zip_9.13-nostrip.patch                           |   36 -------
 p7zip_9.20.1-execstack.patch                       |   24 +++++
 ....58-install.patch => p7zip_9.20.1-install.patch |   87 ++++-------------
 p7zip_9.20.1-norar.patch                           |  102 ++++++++++++++++++++
 p7zip_9.20.1-nostrip.patch                         |   24 +++++
 sources                                            |    2 +-
 9 files changed, 224 insertions(+), 241 deletions(-)
---