Merge with /home/sr/git/u-boot/denx-merge-sr
authorWolfgang Denk <wd@pollux.denx.de>
Mon, 15 Jan 2007 11:48:05 +0000 (12:48 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 15 Jan 2007 11:48:05 +0000 (12:48 +0100)

Trivial merge