[perl-Proc-ProcessTable/el5: 27/27] Merge branch 'master' into el5

[Paul Howarth]

commit fe2bac7c6a9a8a4a8b257901ad1cc936a1f0e3e3
Merge: b5eab91 bd5d064
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Jul 24 22:37:54 2013 +0100

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	perl-Proc-ProcessTable.spec
    	sources

 .gitignore                           |    2 +-
 perl-Proc-ProcessTable-ARG_MAX.patch |   15 -----
 perl-Proc-ProcessTable.spec          |  107 +++++++++++++++++++++++++++++-----
 sources                              |    2 +-
 4 files changed, 93 insertions(+), 33 deletions(-)
---