Merge with /home/wd/git/u-boot/work
authorWolfgang Denk <wd@denx.de>
Thu, 9 Aug 2007 20:11:03 +0000 (22:11 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 9 Aug 2007 20:11:03 +0000 (22:11 +0200)

Trivial merge