Merge with git://www.denx.de/git/u-boot.git
authorStefan Roese <sr@denx.de>
Wed, 11 Jul 2007 10:16:04 +0000 (12:16 +0200)
committerStefan Roese <sr@denx.de>
Wed, 11 Jul 2007 10:16:04 +0000 (12:16 +0200)

Trivial merge