Merge with /home/dzu/src/git/u-boot
authorWolfgang Denk <wd@denx.de>
Fri, 20 Apr 2007 13:50:04 +0000 (15:50 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 20 Apr 2007 13:50:04 +0000 (15:50 +0200)

Trivial merge