[iftop/el5: 5/5] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit a359d80145c338bdf62972d1a30e754a78a414b6
Merge: 89ee49e 745cf10
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Dec 26 17:41:38 2011 +0100

    Merge remote branch 'origin/master' into el5

 .gitignore                    |    2 +-
 iftop-0.17-arm.patch          |   33 --
 iftop-0.17-bandwidth.patch    |   14 -
 iftop-0.17-bar-display.patch  |   15 -
 iftop-0.17-fixtree.patch      |   57 --
 iftop-0.17-frozen-order.patch |   14 -
 iftop-0.17-ipv6-ll.patch      | 1132 -----------------------------------------
 iftop-0.17-man-typos.patch    |   50 --
 iftop-0.17-ncursesw.patch     |   38 --
 iftop-0.17-stringmap.patch    |   42 --
 iftop-0.17-synopsis.patch     |   15 -
 iftop.spec                    |   39 +-
 sources                       |    2 +-
 13 files changed, 14 insertions(+), 1439 deletions(-)
---