Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
authorGrant Likely <grant.likely@secretlab.ca>
Fri, 1 Dec 2006 19:02:30 +0000 (20:02 +0100)
committerStefan Roese <sr@denx.de>
Fri, 1 Dec 2006 19:02:30 +0000 (20:02 +0100)

Trivial merge