Merge with /home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Thu, 16 Aug 2007 10:04:37 +0000 (12:04 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 16 Aug 2007 10:04:37 +0000 (12:04 +0200)

Trivial merge