Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
authorStefan Roese <sr@denx.de>
Fri, 22 Dec 2006 13:21:36 +0000 (14:21 +0100)
committerStefan Roese <sr@denx.de>
Fri, 22 Dec 2006 13:21:36 +0000 (14:21 +0100)

Trivial merge