Merge with /home/hs/SC3/u-boot-dev
authorWolfgang Denk <wd@pollux.denx.de>
Fri, 19 Jan 2007 21:56:23 +0000 (22:56 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 19 Jan 2007 21:56:23 +0000 (22:56 +0100)

Trivial merge