Merge with /home/sr/git/u-boot/denx-merge-sr
authorWolfgang Denk <wd@pollux.denx.de>
Tue, 30 Jan 2007 13:38:21 +0000 (14:38 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 30 Jan 2007 13:38:21 +0000 (14:38 +0100)

Trivial merge