[procps/f14/master: 6/6] Merge branch 'master' into f14

[Jan Görig]

commit 31166890df618f120a9a13e75afbeaa319fe103c
Merge: 233c827 5a91996
Author: Jan Görig <jgorig at redhat.com>
Date:   Tue Oct 19 09:55:28 2010 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	procps.spec

 procps-3.2.7-cleanup.patch        |   12 ------------
 procps-3.2.7-ps-plussort.patch    |   11 -----------
 procps-3.2.7-sysctl-tmpname.patch |   11 -----------
 procps-3.2.7-top-exitcode.patch   |   11 -----------
 procps-3.2.7-top-single.patch     |   11 -----------
 procps-3.2.7-vmstat-sm.patch      |   27 ---------------------------
 procps.spec                       |   30 ++++++++++++++++++++++++++----
 7 files changed, 26 insertions(+), 87 deletions(-)
---