[iftop/el6/master: 6/6] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 03dd5f2faf3ff7e80fac52a5b9c2a418993aed99
Merge: db5f4bd b030a0d
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Nov 19 00:53:32 2010 +0100

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	iftop.spec

 iftop-0.17-arm.patch          |   33 ++
 iftop-0.17-bar-display.patch  |   15 +
 iftop-0.17-frozen-order.patch |   14 +
 iftop-0.17-ipv6-ll.patch      | 1132 +++++++++++++++++++++++++++++++++++++++++
 iftop-0.17-man-typos.patch    |   33 ++-
 iftop-0.17-stringmap.patch    |   42 ++
 iftop.spec                    |   21 +-
 7 files changed, 1286 insertions(+), 4 deletions(-)
---