Merge with /home/sr/git/u-boot/denx
authorWolfgang Denk <wd@pollux.denx.de>
Mon, 27 Nov 2006 12:55:31 +0000 (13:55 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 27 Nov 2006 12:55:31 +0000 (13:55 +0100)

Trivial merge