Merge with git://www.denx.de/git/u-boot.git
authorStefan Roese <sr@denx.de>
Wed, 20 Jun 2007 06:23:42 +0000 (08:23 +0200)
committerStefan Roese <sr@denx.de>
Wed, 20 Jun 2007 06:23:42 +0000 (08:23 +0200)

Trivial merge