Merge with /home/tur/proj/idmr/u-boot
authorWolfgang Denk <wd@pollux.denx.de>
Wed, 24 Jan 2007 09:26:47 +0000 (10:26 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 24 Jan 2007 09:26:47 +0000 (10:26 +0100)

Trivial merge