Merge with git://www.denx.de/git/u-boot.git
authorStefan Roese <sr@denx.de>
Fri, 22 Jun 2007 08:28:26 +0000 (10:28 +0200)
committerStefan Roese <sr@denx.de>
Fri, 22 Jun 2007 08:28:26 +0000 (10:28 +0200)

Trivial merge