Merge with /home/wd/git/u-boot/work
authorWolfgang Denk <wd@denx.de>
Fri, 10 Aug 2007 08:34:10 +0000 (10:34 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 10 Aug 2007 08:34:10 +0000 (10:34 +0200)

Trivial merge