Merge with /home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Mon, 18 Jun 2007 19:38:46 +0000 (21:38 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 18 Jun 2007 19:38:46 +0000 (21:38 +0200)

Trivial merge