Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx-merge-sr
authorStefan Roese <sr@denx.de>
Sat, 13 Jan 2007 07:01:31 +0000 (08:01 +0100)
committerStefan Roese <sr@denx.de>
Sat, 13 Jan 2007 07:01:31 +0000 (08:01 +0100)

Trivial merge