Merge with /home/mk/11-cmb1920/u-boot#4upstream
authorWolfgang Denk <wd@pollux.denx.de>
Wed, 10 Jan 2007 14:34:43 +0000 (15:34 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 10 Jan 2007 14:34:43 +0000 (15:34 +0100)

Trivial merge