Merge with /home/git/u-boot
authorWolfgang Denk <wd@pollux.denx.de>
Sat, 13 Jan 2007 10:17:35 +0000 (11:17 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 13 Jan 2007 10:17:35 +0000 (11:17 +0100)

Trivial merge