Merge

2004/07/16 15:25:46-07:00 osdl.net!shemminger
ChangeLog:
  update with latest patch changes

2004/07/16 15:24:16-07:00 osdl.net!shemminger
Adds mpu support to HTB (ATM) queueing discipline
see http://bugs.gentoo.org/show_bug.cgi?id=56959
from  http://luxik.cdi.cz/~devik/qos/htb/v3/htb_tc_overhead.diff

2004/07/16 15:19:14-07:00 osdl.net!shemminger
ChangeSet@1.57, 2004-07-12 20:01:23+09:00, nakam@linux-ipv6.org
  fix message for protocol.

2004/07/16 15:16:08-07:00 osdl.net!shemminger
ChangeSet@1.56, 2004-07-12 20:00:04+09:00, nakam@linux-ipv6.org
  fix output format to follow command line option style when using
  without "-s" option.

2004/07/16 15:15:27-07:00 osdl.net!shemminger

ChangeSet@1.55, 2004-07-12 19:58:53+09:00, nakam@linux-ipv6.org
  fix usage message for ipxfrm.

BKrev: 410aaee7mTVuOGf5I6ROc8bzauFuLg