Merge with /home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Mon, 14 May 2007 22:23:53 +0000 (00:23 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 14 May 2007 22:23:53 +0000 (00:23 +0200)

Trivial merge