Merge with /home/wd/git/u-boot/custodian/u-boot-net
authorWolfgang Denk <wd@denx.de>
Wed, 18 Apr 2007 15:10:30 +0000 (17:10 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 18 Apr 2007 15:10:30 +0000 (17:10 +0200)

Trivial merge