Merge with /home/wd/git/u-boot/work
authorWolfgang Denk <wd@denx.de>
Tue, 14 Aug 2007 15:38:34 +0000 (17:38 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 14 Aug 2007 15:38:34 +0000 (17:38 +0200)

Trivial merge