Merge with /home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Sun, 24 Dec 2006 00:33:32 +0000 (01:33 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 24 Dec 2006 00:33:32 +0000 (01:33 +0100)

Trivial merge